From e60e50a9c5a87062922131aa18fbc742ef65c2e5 Mon Sep 17 00:00:00 2001 From: Timo Schulz Date: Sun, 22 May 2016 14:33:35 +0200 Subject: [PATCH 1/2] teach git to ignore .DS_STORE files --- .gitignore | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e3308905..b8b3cdb3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,28 +8,32 @@ release.properties dependency-reduced-pom.xml buildNumber.properties .mvn/timing.properties + ### Java template *.class -# Mobile Tools for Java (J2ME) +### Mobile Tools for Java (J2ME) .mtj.tmp/ -# Package Files # +### Package Files # *.jar *.war *.ear -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +### virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -# logs files +### logs files *.log -# Certs +### Certs *.jks *.cer *.pem -# IDE files +### IDE files .idea/ *.iml + +#File System specific files +.DS_STORE \ No newline at end of file From ea339c08e62f23b5c1f4bf1c5d19c5fb16293f1a Mon Sep 17 00:00:00 2001 From: Timo Schulz Date: Sun, 22 May 2016 14:37:30 +0200 Subject: [PATCH 2/2] remove .DS_STORE files from tracking --- .DS_Store | Bin 6148 -> 0 bytes src/.DS_Store | Bin 6148 -> 0 bytes src/main/.DS_Store | Bin 6148 -> 0 bytes src/main/java/.DS_Store | Bin 6148 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 src/.DS_Store delete mode 100644 src/main/.DS_Store delete mode 100644 src/main/java/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 23b437c2154a1e5ee4df5f7e507c1d9fc8ead69b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z-O8rh18}Ab8oU&_nAF#apa;6bh9VQK^XubfF}rNi9+eIr|v?KZYRs z4nB%EXLi@3R4*Px%1oI3W@l#-=3Cg!FvfVL=a(3>8DkbGVkQs6H-hV^W0El*4hU+q zxZ|}W4`y#(XDpf=|B(UQyDW=Ymz{b2&->SwaZ)V4@=P{2H9ceHXXo&-=Vwo9t*Bp1 z+@u#*-0qQ@Nk8z6U3HVzhkX!5?UC(zbs6-V_To+yCaw&F?x)n_h7A3vUx|95A0OBB z`x??uT1|VY+6~Sjwd#gJUB=RrZJAtHd3>7o@?fxDS}TZBd23h@gL1i85F6{|;n04x ztd-Tx?ft{f@bc>V=JxLX;ptiL0mrgY7Bq~;mytyVF+dCu0~5@EIRve_39gY!BL;|p z-!Xvag8)Tz45k{@(E)>M0RVI0RsuHm5||?lItEjXumZw$Dxgl~rp4eo9sI(?IR;aW zI-POTd~ow+ZaNgMz7FpfDx7ggBaOrWG4Pdvte)C<|L^_W|9?%Q88JW%OcVn=w_Dq- zKuP9q9V-s+S^;_rih^;e#!(6w>MDjS5Zz5d_8DkbGVkQT}H-hV^W0El*4hU*9 zuNSwyR^-9_eJq+B|B(UQyDU3rE|V<$x_@4~CF7)6eB+s^?DWj6mCMiJW6$SL>&>WF zPu!#%SKQ9Ann^$Kj9qh+=BK?MMXjOjdIvJ-HSEQmC`?=#2AwadCx!r1VD3!Mc1<@~;iv_WYFM8{yNQ5_vHs1^V)3vMM~V=sX@!k}X?)d(vfT&Du+RBl=fuG7IUOq^pd z)u_`MH_Zn(U*@Jm;p*$~exbq{cQn#S3=jjO3{2^%jrafV&;9>s63vJKVql^e;Mr=u zT7il2s8fYK}{*-|a D?o?k2 diff --git a/src/main/.DS_Store b/src/main/.DS_Store deleted file mode 100644 index 9d2a42b384b31f1b70c5b2a6473c440e430d708c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5ZAzTq%BekIr|v?KZYRs z4nB%EXLi@3R4*Px%1oI3W@l#-=3Cg!FvfVf>lYcb8DkbGVkQT}H-hV^W0El*4hU*9 zuOGL)R^-9_Z7iA`|B(UQyDU3rF6%M(^Zt45mW-1^;gx5mvePrOR&H({AA4c$wAzgN z)x=G@aoO#hsG0Nw&)5|=X@1y;QPdjQu6HDZe#2hcjl#s0VbJ-MTCd5_kNV}P8~Sm* zs^3?We$s5%%au;hgVc%}21hcMo@~kF!ph;(uvZ3yjpBM<6ieH~ycm>9g}m6@C=G}9 zqh+nGZS5Q!w}+Qk*EhF!_YY6cdKWkrjG`@^1GKc|UfEbuq2Fwv?%};EFR2VTp z4E&Y>JRbxoqGK@CsE!U8R0{x@1-BBgv6sLcVbC#{YJ?RKu2TVZDmN_#*XiIFCeAUK zYSihBo92U?FLTqOaP@U~zfj?fI~r*u28e;L3{2^%jrafl&;9?`B$^Qe#K1%`z_WYR zy)u+!?$)v5@U9i0XP_t;mueiPfT6Bph{daT1yl+61sZ^k!Biu7KS5Z-O8rh18}Ab8oU&_nAF#apa;6bh9VQK<8DkbGVkQs6H-hV^W0El*4hU+q zxZ|}W4`y#(XDpf=|B(UQyDW=Xmz{b2&->SwaZ)V4@=P{2H9ceHXXo&-=Vwo9t*Bp1 z+@u#*-0qQ@Nk8z6U3HVzhkX!5?UC(zbs6-V_To+yCaw&F?x)n_h7A3vUx|95A0OBB z`x??uT1|VY+6~Sjwd#gJUB=RrZJAtHd3>7o@?fxDS}TZBd23h@gL1i85F6{|;n04x ztd-Tx?ft{f@bc>V=JxLX;ptiL0mrgY7Bq~;mytyVF+dCu0~5@EIRve_39gY!BL;|p z-!Xvag8)Tz45k{@(E)>M0RVI0RsuHm5||?lItEjXumZw$Dxgl~rp4eo9sI(?IR;aW zI-POTd~ow+ZaNgMz7FpfDx7ggBaOrWG4Pdvte)C<|L^_W|9?%Q88JW%OcVn=w_Dq- zKuP9q9V-s+S^;_rih^;e#!(6w>MDj