add package-lock.json to .gitignore to avoid merge conflicts

dmsalte · Oct 15, 2017 · ec25130 · ec25130
1 parent 4ba9b3e
commit ec25130
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 bower_components/
 node_modules/
 
+package-lock.json
 
 bundle/bundle.out.js
 
@@ -22,4 +23,4 @@ coverage/
 npm-debug.log
 *.heapsnapshot
 
-/tmp
+/tmp