Skip to content

Commit

Permalink
- Merged conflict in gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
@mallocator
mallocator committed Mar 7, 2013
1 parent d854baf commit 20cd1ac
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/target
.DS_Store

0 comments on commit 20cd1ac

Please sign in to comment.