diff options
| author | Stanley Yip <stanley_yip@brown.edu> | 2020-01-20 13:45:45 -0500 |
|---|---|---|
| committer | Stanley Yip <stanley_yip@brown.edu> | 2020-01-20 13:45:45 -0500 |
| commit | 40b0096ecbaa873a5e0b4b8955431842d306063f (patch) | |
| tree | b0f751115400fa2c21a81890ad47bf65fa07645f | |
| parent | 87bdb7c7eafa1e91e371c9d88b8dd36197f497d3 (diff) | |
oop
| -rw-r--r-- | package-lock.json | 5 |
1 files changed, 1 insertions, 4 deletions
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 |