diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-07 12:32:35 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-07 12:32:35 -0500 |
| commit | 33bd0d4fdebb528fec8e3018f8d972f20b205476 (patch) | |
| tree | d96d24ff8dd6a4cfa2a2154684e65d9ab0d22763 | |
| parent | 5c929c4283a82b3ba8de37506533341af9cde017 (diff) | |
| download | gitlab-ce-33bd0d4fdebb528fec8e3018f8d972f20b205476.tar.gz | |
resolve conflicts with master
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 90fb2fd951b..59ef9b884cb 100644 --- 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", diff --git a/yarn.lock b/yarn.lock index 9c464606c6f..d5c8a035b39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8699,9 +8699,9 @@ undefsafe@^2.0.2: dependencies: debug "^2.2.0" -underscore@^1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" +underscore@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.0.tgz#31dbb314cfcc88f169cd3692d9149d81a00a73e4" underscore@~1.6.0: version "1.6.0" |