fixed leftover merge conflict in .gitignore
dev
1 parent 35d6d0b commit 39173e194af32180295c80a60a126f8d70e85455
@xsrust xsrust authored on 25 Jul 2016
Showing 1 changed file
View
.gitignore