resolve conflicts with master

33bd0d4f · Mike Greiling · 5c929c42 · 33bd0d4f · 33bd0d4f
Commit 33bd0d4f authored May 07, 2018 by Mike Greiling
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

package.json package.json +1 -1

yarn.lock yarn.lock +3 -3

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

--- a/yarn.lock
+++ b/yarn.lock
@@ -8699,9 +8699,9 @@ undefsafe@^2.0.2:
  dependencies:
    debug "^2.2.0"
-underscore@^1.8.3:
+underscore@^1.9.0:
-  version "1.8.3"
+  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.0.tgz#31dbb314cfcc88f169cd3692d9149d81a00a73e4"
 underscore@~1.6.0:
  version "1.6.0"