Fix merge conflicts on gitignore

2022-08-12 22:35:50 -07:00
parent 654e7589a6 c0e6b7af58
commit 9a3929554b
310 changed files with 18062 additions and 2974 deletions
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -1,10 +1,10 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.

 # production config and external assets
-*.json
 !mempool-config.template.json
 !mempool-config.sample.json
-
+mempool-config.json
+pools.json
 icons.json

 # compiled output