Resolve yarn.lock

34aae2de · Luke Bennett · 3b2148a9 · 34aae2de
Commit 34aae2de authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

yarn.lock yarn.lock +0 -5

No files found.
--- a/yarn.lock
+++ b/yarn.lock
@@ -6538,13 +6538,8 @@ void-elements@^2.0.0:
  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"

 vue-eslint-parser@^2.0.1:
-<<<<<<< HEAD
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.2.tgz#8d603545e9d7c134699075bd1772af1ffd86b744"
-=======
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.1.tgz#30135771c4fad00fdbac4542a2d59f3b1d776834"
->>>>>>> upstream/master
  dependencies:
    debug "^3.1.0"
    eslint-scope "^3.7.1"