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

This reverts commit ec25130845.
We now use  npm-shrinkwrap.json
This commit is contained in:
PieterGit
2017-10-27 16:34:27 +02:00
parent d2a8d50a0a
commit 4a0c508688
+1 -2
View File
@@ -1,7 +1,6 @@
bower_components/
node_modules/
package-lock.json
bundle/bundle.out.js
@@ -24,4 +23,4 @@ coverage/
npm-debug.log
*.heapsnapshot
/tmp
/tmp