Unverified Commit 33bd0d4f authored by Mike Greiling's avatar Mike Greiling
Browse files

resolve conflicts with master

parent 5c929c42
...@@ -8699,9 +8699,9 @@ undefsafe@^2.0.2: ...@@ -8699,9 +8699,9 @@ undefsafe@^2.0.2:
dependencies: dependencies:
debug "^2.2.0" 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: underscore@~1.6.0:
version "1.6.0" version "1.6.0"
......
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