X-Git-Url: https://git.r.bdr.sh/rbdr/super-polarity/blobdiff_plain/3de51c6f55d304f038df1b77c8ab346e2a187fe1..8ae8ea0d77ec654dd693b3912562b07a2b539b0f:/.gitignore

diff --git a/.gitignore b/.gitignore
index 3d43fd7..cf9f70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Object files
 *.o
 
@@ -168,4 +167,3 @@ $RECYCLE.BIN/
 
 # Mac crap
 .DS_Store
->>>>>>> bca44639c27169b0643de1b56361e6c2958d1d4a