Skip to content
Browse files

Removed conflict markers from .gitignore file.

  • Loading branch information...
1 parent 3490377 commit 104b6f61dc76b9ef62c37ae1b750ab0f61c268e5 Sash Bermeister committed Nov 27, 2012
Showing with 0 additions and 4 deletions.
  1. +0 −4 .gitignore
View
4 .gitignore
@@ -1,6 +1,2 @@
*~
-<<<<<<< HEAD
-.DS_Store
-=======
*.DS_store
->>>>>>> ignore DS_store

0 comments on commit 104b6f6

Please sign in to comment.
Something went wrong with that request. Please try again.