fix conflict

litteredwitherrors · May 1, 2017 · 9a748c5 · 9a748c5
2 parents 591965b + 189dea6
commit 9a748c5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-.DS_store
+.DS_Store
+>>>>>>> 189dea6d43e3250573e483cf1094bd2335882cad
 node_modules
 public
 data/ghost-dev.db