derped the ignore

2026-05-11 06:16:08 +01:00 · 2015-10-24 11:34:41 -04:00
parent 17f13a51a4
commit febed4cae6
1 changed files with 0 additions and 4 deletions
@@ -15,10 +15,6 @@ npm-debug.log
 config.json
 config.test.json
 persist/
-<<<<<<< HEAD
 log/
-=======
-

 .AppleDouble
->>>>>>> master