ShaYmez
/
DMRlink
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix gitignore from merge errors.

This commit is contained in:
Adam Fast 2013-06-28 22:50:18 -05:00
parent c0ee304768
commit 20d8013b26
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -1,11 +1,3 @@
.DS_Store
.dropbox
<<<<<<< HEAD
<<<<<<< HEAD
Icon
=======
Icon
>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389
=======
Icon
>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389