Removed conflict markers from .gitignore file.

GoogleChrome · Nov 26, 2012 · 104b6f6 · 104b6f6 · bitcoinpro6 · Nov 3, 2020
1 parent 3490377
commit 104b6f6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,2 @@
 *~
-<<<<<<< HEAD
-.DS_Store
-=======
 *.DS_store
->>>>>>> ignore DS_store