From 40b0096ecbaa873a5e0b4b8955431842d306063f Mon Sep 17 00:00:00 2001
From: Stanley Yip <stanley_yip@brown.edu>
Date: Mon, 20 Jan 2020 13:45:45 -0500
Subject: oop

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

(limited to 'package-lock.json')

diff --git a/package-lock.json b/package-lock.json
index 0157e0c99..aab437d21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15565,8 +15565,6 @@
             "requires": {
                 "inherits": "~2.0.1",
                 "readable-stream": "^2.0.2"
-<<<<<<< HEAD
-=======
             }
         },
         "stream-combiner": {
@@ -15576,7 +15574,6 @@
             "requires": {
                 "duplexer": "~0.1.1",
                 "through": "~2.3.4"
->>>>>>> df61d40f92a29f948d9f513fb9f50349f16500ee
             }
         },
         "stream-each": {
@@ -18248,4 +18245,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2