Resolve conflicts in package.json

[ci-skip]

Resolve conflicts in package.json
[ci-skip]
e2dc0700 · Mike Greiling · 002b02fe · e2dc0700
Commit e2dc0700 authored May 08, 2018 by Mike Greiling
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

package.json package.json +0 -4

No files found.
--- a/package.json
+++ b/package.json
@@ -80,11 +80,7 @@
    "three-orbit-controls": "^82.1.0",
    "three-stl-loader": "^1.0.4",
    "timeago.js": "^3.0.2",
-<<<<<<< HEAD
-    "underscore": "^1.8.3",
-=======
    "underscore": "^1.9.0",
->>>>>>> upstream/master
    "url-loader": "^1.0.1",
    "visibilityjs": "^1.2.4",
    "vue": "^2.5.16",