Commit e2dc0700 authored by Mike Greiling's avatar Mike Greiling

Resolve conflicts in package.json

[ci-skip]
parent 002b02fe
...@@ -80,11 +80,7 @@ ...@@ -80,11 +80,7 @@
"three-orbit-controls": "^82.1.0", "three-orbit-controls": "^82.1.0",
"three-stl-loader": "^1.0.4", "three-stl-loader": "^1.0.4",
"timeago.js": "^3.0.2", "timeago.js": "^3.0.2",
<<<<<<< HEAD
"underscore": "^1.8.3",
=======
"underscore": "^1.9.0", "underscore": "^1.9.0",
>>>>>>> upstream/master
"url-loader": "^1.0.1", "url-loader": "^1.0.1",
"visibilityjs": "^1.2.4", "visibilityjs": "^1.2.4",
"vue": "^2.5.16", "vue": "^2.5.16",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment