Resolve conflicts in package.json

35ecb168 · Stan Hu · 3db19c99 · 35ecb168
Commit 35ecb168 authored Jul 13, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

package.json package.json +0 -3

No files found.
--- a/package.json
+++ b/package.json
@@ -37,10 +37,7 @@
    "core-js": "^2.4.1",
    "cropper": "^2.3.0",
    "css-loader": "^1.0.0",
-<<<<<<< HEAD
    "d3": "4.12.2",
-=======
->>>>>>> upstream/master
    "d3-array": "^1.2.1",
    "d3-axis": "^1.0.8",
    "d3-brush": "^1.0.4",