Update .gitignore

dbca-wa · May 23, 2018 · 645a4d0 · 645a4d0
1 parent 2e1751c
commit 645a4d0
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,11 +91,6 @@ importo.py
 
 *.djcache
 uwsgi.ini
-<<<<<<< HEAD
-=======
-
-disturbance/static/disturbance_vue/static/css/app.css
-disturbance/static/disturbance_vue/static/js/app.js
-disturbance/static/disturbance_vue/static/js/manifest.js
-disturbance/static/disturbance_vue/static/js/vendor.js
->>>>>>> upstream/disturbance_v3
+
+# npm locks
+*-lock.json