derped the ignore

This commit is contained in:
Jon Maddox
2015-10-24 11:34:41 -04:00
parent 17f13a51a4
commit febed4cae6

4
.gitignore vendored
View File

@@ -15,10 +15,6 @@ npm-debug.log
config.json
config.test.json
persist/
<<<<<<< HEAD
log/
=======
.AppleDouble
>>>>>>> master