From 3a62d700bde7601c91f605230d19005edbbe682f Mon Sep 17 00:00:00 2001 From: schmeeve Date: Sat, 11 Jul 2026 20:46:32 -0700 Subject: [PATCH] fix dupes --- ...llum.local's conflicted copy 2024-10-30).scpt | Bin 1378 -> 0 bytes ...llum.local's conflicted copy 2025-03-11).scpt | Bin 1378 -> 0 bytes ... MacBook Pro's conflicted copy 2025-07-28).scpt | Bin 1378 -> 0 bytes .../TXT.rtf | 5 ----- .../TXT.rtf | 5 ----- .../TXT.rtf | 5 ----- 6 files changed, 15 deletions(-) delete mode 100644 displaycount (Callum.local's conflicted copy 2024-10-30).scpt delete mode 100644 displaycount (Callum.local's conflicted copy 2025-03-11).scpt delete mode 100644 displaycount (Steve’s MacBook Pro's conflicted copy 2025-07-28).scpt delete mode 100644 quit-app.app/Contents/Resources/description (Fergus.local's conflicted copy 2024-10-01) (Steve’s MacBook Pro's conflicted copy 2025-03-18).rtfd/TXT.rtf delete mode 100644 quit-app.app/Contents/Resources/description (Fergus.local's conflicted copy 2024-10-01).rtfd/TXT.rtf delete mode 100644 quit-app.app/Contents/Resources/description (Steve’s MacBook Pro's conflicted copy 2025-03-18).rtfd/TXT.rtf diff --git a/displaycount (Callum.local's conflicted copy 2024-10-30).scpt b/displaycount (Callum.local's conflicted copy 2024-10-30).scpt deleted file mode 100644 index 42aae5740580cb5cdac8a7ff1b5725bb6508fd6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1378 zcmb_c$xa(V5Pdy17-rlaW3w-kl_N@Q$kDe1I|2#B0U;&F$uJ5|yvZ|I;+9XykK~#k z2!D{A5j$ZI`xdBF4<K&Xc9p{LqISC z$-MZ$di4c01bL+i&5}tV&pZ%8h;HddA_Q&HH;bSJt&)jWQJdI@4nvW^7<&uCpkD~n zwa!y_(k@jTyXZNC{Q0{Ph2kZ`5YK)45MAkXg`hr@bITfCD^vzV>CT)k4Z1|{5DahD zQ5Jb?-t~n{O^|4XDEQU_(u5RWTJHA#Pns(@RcHcMKIbaG;x(5?geNRJSM*BmY+^K1 z7j8AN@aAO(TxX)_SiySdB(hbf=($O&T&}ZiBq|@u-@ToZ0X<>Q-D~_gJi_Ikaw^rF z?YN9Dl}b;|yPi`>kLTW2tjc`)p+UMHR7xH96F#9a6ky>U93+rMmFFTnxJa_L%)g0V zKEDZ;Y~=j460gp(^(Zok;ptt}R4r=iVboN8RKy`tQ27YDRpbT?y_rV@rexxGqRDQf zbV28m@%f#nG;N4UCVsP+ynbfTS%YSY{cWvNgHF*ugmA5|?9yD(`y-7gNzjFYbgm$o zJmPdB8L$s2jt;cbF&#;?LyYqYC{2fC;sc8F>Y+i04MQBO5Jwz>PSgqTwKJm#pqYN6 z6J2yb`?M!m;LJM_q+QyfZQ9almoJ#*RJ{^6RBW%h1ZW>Z&>mp9c7@-q@YUkt=ij)LTAKg> diff --git a/displaycount (Callum.local's conflicted copy 2025-03-11).scpt b/displaycount (Callum.local's conflicted copy 2025-03-11).scpt deleted file mode 100644 index 4097f1a6540533301426b24556978749f56f5a67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1378 zcmb_c$xa(V5Pdy17-rlaW3w-kl_N@Q$kDe1I|2#B0U_l&8Aid0H+cq2-0}(ek>r>k zNY1$=XT(m}!@dP7)q_cprQl0u)YVnh)m5*mtNVrJ&P+d>N(?85ht!Aw2%1C?&=3&J zKr%1hvR-{b4MARMLbGHN$TJT_5TYBpmIy(c^vxn@L91k1FkbsbgW>#b`sgDQ}o=VRW8@rHWHN&aJJDpf zQ97qH$@u)vQ<^r!Bon_`OkO`V=(Itz#QwI{i9sjmA40g+S9WQx=>3sKlqBd}K{`{A zOdfGMmJHa36h{Zz>4**`+9AgI1eB&jGVuY$dG)}cgN7lFRER?kLC5L@_}ZCK1kg-B z(TOhFr#;#gEO6$X2+|I1(-v*&w8Iz7a;jd58>%>$&jarm#C!jO8MOUiAq?7Th-*`! z=|U(B-=-%&XTMK= aG0gz&Lj-6KLeMT?xpsx$t?=c-!iV1!1zSA; diff --git a/displaycount (Steve’s MacBook Pro's conflicted copy 2025-07-28).scpt b/displaycount (Steve’s MacBook Pro's conflicted copy 2025-07-28).scpt deleted file mode 100644 index c1a44d623aabfd8e7301d13e3e22231dc1e7d55d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1378 zcmb_c$xa(V5Pdy17-rlaW3w8NtQ=8dLylH133dbuhyy~(bux^=i8pzSC2skIobwO4 z<_D5LNY03zu!nsMRH_G)AWOlQ%&4oYs;jGBRaf^*%blKjJ{ccM3=OIg0^m1^AfUk~ zn1N(oykouk{2Khc(u8Ko#Ft|p2q8c>bS)8pHsP6t(1KRUL@TRJ>_dm4h;Nj=`C-s6 z1nElWsXJj8%Z^>BI0O87yAg)sC4vx7J^KJ%>U0UeKAm+-8eJ(=21N1JoGuKyKx`03 zW!6y^Icwhagmg`iXobjo)&kOm6rWpe_x?|s%{x_S0#+{TD!<}2mq!H0EjwGN6y4eQ zNV+cE>a$lLU!=ixCJK+{tr;htsXB#|v`>MUE2AdLtf-$qT=q9*T0P1Z+66e0^4m2bS4>}*Lh0QhKOY1HH*pXrv{xiXqL#|);clh1bu@D*80jW&J`+uq+ulqI#-a+ z6eN>Jl#V3>_8>*kfp$8gLy2~XF+KsM>5xo3Kv7;jFzBFRh$9u^kVDY1Isv|RW*9y+ z(@%7wi}q=cb_ENZc_;j|L))}Pn>y|A1+$!LrN|9cn9JpW_YC5LcfkzWey|V*Z8gNT zsnB#G5T+mKrVUz04`Q^YEAgL!CA#mPln(T2=;eHx(5In~nGpIl^m}z&)o4}ay`l16 zSGn~l5@TaYE3`~Yw5Zcc?Oo7m`GMEOprr=ME;dNEjn>e)7=bac^yF<2TISo-#FxzX diLa*VqkU*T+T+_#yMX1|Wq!AUmkSG@egp4fT4w+N diff --git a/quit-app.app/Contents/Resources/description (Fergus.local's conflicted copy 2024-10-01) (Steve’s MacBook Pro's conflicted copy 2025-03-18).rtfd/TXT.rtf b/quit-app.app/Contents/Resources/description (Fergus.local's conflicted copy 2024-10-01) (Steve’s MacBook Pro's conflicted copy 2025-03-18).rtfd/TXT.rtf deleted file mode 100644 index 455a7f5..0000000 --- a/quit-app.app/Contents/Resources/description (Fergus.local's conflicted copy 2024-10-01) (Steve’s MacBook Pro's conflicted copy 2025-03-18).rtfd/TXT.rtf +++ /dev/null @@ -1,5 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2709 -\cocoatextscaling0\cocoaplatform0{\fonttbl} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;;} -} \ No newline at end of file diff --git a/quit-app.app/Contents/Resources/description (Fergus.local's conflicted copy 2024-10-01).rtfd/TXT.rtf b/quit-app.app/Contents/Resources/description (Fergus.local's conflicted copy 2024-10-01).rtfd/TXT.rtf deleted file mode 100644 index 455a7f5..0000000 --- a/quit-app.app/Contents/Resources/description (Fergus.local's conflicted copy 2024-10-01).rtfd/TXT.rtf +++ /dev/null @@ -1,5 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2709 -\cocoatextscaling0\cocoaplatform0{\fonttbl} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;;} -} \ No newline at end of file diff --git a/quit-app.app/Contents/Resources/description (Steve’s MacBook Pro's conflicted copy 2025-03-18).rtfd/TXT.rtf b/quit-app.app/Contents/Resources/description (Steve’s MacBook Pro's conflicted copy 2025-03-18).rtfd/TXT.rtf deleted file mode 100644 index 455a7f5..0000000 --- a/quit-app.app/Contents/Resources/description (Steve’s MacBook Pro's conflicted copy 2025-03-18).rtfd/TXT.rtf +++ /dev/null @@ -1,5 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2709 -\cocoatextscaling0\cocoaplatform0{\fonttbl} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;;} -} \ No newline at end of file