From 645a4d009d6de8839b75f4ef53d8b38ccaca3caa Mon Sep 17 00:00:00 2001
From: Adon Metcalfe <adon.metcalfe@dbca.wa.gov.au>
Date: Wed, 23 May 2018 15:05:22 +0800
Subject: [PATCH] Update .gitignore

---
 .gitignore | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7357244136..79647a02d4 100644
--- 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