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

This commit is contained in:
Scott
2017-10-15 14:03:29 -07:00
parent 4ba9b3eadd
commit ec25130845
+2 -1
View File
@@ -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