diff options
| author | Fawn <fangrui_tong@brown.edu> | 2020-01-09 16:41:52 -0500 |
|---|---|---|
| committer | Fawn <fangrui_tong@brown.edu> | 2020-01-09 16:41:52 -0500 |
| commit | 5abc4de3c3495db71b0a9bcbe2468828f674eff3 (patch) | |
| tree | f38e252f485de0b643a48ddfe1e0aeca53078576 /package-lock.json | |
| parent | 9a8d2a903b10568686cc66c849fba21b1ab75be2 (diff) | |
minor merge
Diffstat (limited to 'package-lock.json')
| -rw-r--r-- | package-lock.json | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/package-lock.json b/package-lock.json index cad3edd82..6aa0ffc02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7073,11 +7073,7 @@ "babel-runtime": "^6.22.0", "bluebird": "^3.4.7", "boolify-string": "^2.0.2", -<<<<<<< HEAD - "emit-logger": "github:chocolateboy/emit-logger#b9d25a2d939e42f29c940861e9648bd0fb810070", -======= "emit-logger": "github:chocolateboy/emit-logger#better-emitter-name", ->>>>>>> 540bda7295f6ee7c2eed848598de6f5df74b2723 "lodash": "^4.17.4", "semver": "^5.0.3", "source-map-support": "^0.5.9" @@ -18091,4 +18087,4 @@ } } } -} +}
\ No newline at end of file |