Permalink
Browse files

Merge pull request #50 from sbermeister/master

Fixed a conflict marker in the .gitignore file
  • Loading branch information...
2 parents 3490377 + 104b6f6 commit e37282e08c61946008babe5abe8f56c43cc7b419 @nornagon nornagon committed Nov 27, 2012
Showing with 0 additions and 4 deletions.
  1. +0 −4 .gitignore
View
@@ -1,6 +1,2 @@
*~
-<<<<<<< HEAD
-.DS_Store
-=======
*.DS_store
->>>>>>> ignore DS_store

0 comments on commit e37282e

Please sign in to comment.