From 6d2ac59c27da5bee9f951f027768015ee0b27f42 Mon Sep 17 00:00:00 2001
From: anika-ahluwalia <anika.ahluwalia@gmail.com>
Date: Fri, 22 May 2020 11:28:57 -0500
Subject: fixed merge conflict

---
 package-lock.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'package-lock.json')

diff --git a/package-lock.json b/package-lock.json
index 0439d7363..2a9e33a28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14400,9 +14400,6 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
             "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-<<<<<<< HEAD
-            
-=======
             "dev": true,
             "requires": {
                 "resolve-from": "^3.0.0"
@@ -17959,5 +17956,4 @@
             }
         }
     }
-}
->>>>>>> fdbff9dbb60b4af8f6feba67feda5376263dd7ca
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2