Skip to content

Commit

Permalink
Update .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
@terrymanu
terrymanu committed Jan 19, 2016
1 parent 201ea55 commit 57331dc
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,7 @@ logs/
*.diff
*.patch
*.tmp
<<<<<<< HEAD

# system ignore
.DS_Store
Thumbs.db
=======

# system ignore
.DS_Store
Thumbs.db

>>>>>>> d2aa9f588f5ed3f3bb4b93f956bb07d35ba29e70

0 comments on commit 57331dc

Please sign in to comment.