From ec2513084594c851bf9f1d00cc6f3387e75e177b Mon Sep 17 00:00:00 2001
From: Scott <scottleibrand@gmail.com>
Date: Sun, 15 Oct 2017 14:03:29 -0700
Subject: [PATCH] add package-lock.json to .gitignore to avoid merge conflicts

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e088fce0240..df987ec7276 100644
--- 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
\ No newline at end of file
+/tmp