]> git.r.bdr.sh - rbdr/super-polarity/commitdiff
Proper merge for gitignore
authorBen Beltran <redacted>
Mon, 3 Feb 2014 15:51:29 +0000 (09:51 -0600)
committerBen Beltran <redacted>
Mon, 3 Feb 2014 15:51:29 +0000 (09:51 -0600)
.gitignore

index 3d43fd7fad75d3014ba7842fde4e575e48c6958a..cf9f70bc60366b4aad6eecd1b959dd48cd9562fb 100644 (file)
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Object files
 *.o
 
 # Object files
 *.o
 
@@ -168,4 +167,3 @@ $RECYCLE.BIN/
 
 # Mac crap
 .DS_Store
 
 # Mac crap
 .DS_Store
->>>>>>> bca44639c27169b0643de1b56361e6c2958d1d4a