From cd2c9ee334772f2d240b99a73acf59f7956eb4ec Mon Sep 17 00:00:00 2001
From: Hyunsujk <hyunsujk@gmail.com>
Date: Wed, 14 Oct 2020 09:19:44 -0500
Subject: [PATCH] ignore package-lock

---
 app/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/.gitignore b/app/.gitignore
index e86fe25..e675663 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -67,3 +67,6 @@ yarn-error.log
 .pnp.js
 # Yarn Integrity file
 .yarn-integrity
+
+# ignore package-lock as it complicates merging
+package-lock.json
\ No newline at end of file