Fix gitignore from merge errors.
This commit is contained in:
parent
c0ee304768
commit
20d8013b26
8
.gitignore
vendored
8
.gitignore
vendored
@ -1,11 +1,3 @@
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
.dropbox
|
.dropbox
|
||||||
<<<<<<< HEAD
|
|
||||||
<<<<<<< HEAD
|
|
||||||
Icon
|
Icon
|
||||||
=======
|
|
||||||
Icon
|
|
||||||
>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389
|
|
||||||
=======
|
|
||||||
Icon
|
|
||||||
>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389
|
|
||||||
|
Loading…
Reference in New Issue
Block a user