Fix conflict for yarn.lock [ci skici skip]

403b9464 · Filipa Lacerda · df46e511 · 403b9464
Commit 403b9464 authored Jan 11, 2018 by Filipa Lacerda
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
@@ -2402,13 +2402,8 @@ eslint-plugin-promise@^3.5.0:
  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz#78fbb6ffe047201627569e85a6c5373af2a68fca"
 eslint-plugin-vue@^4.0.1:
-<<<<<<< HEAD
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.1.0.tgz#b5f65c04e1741fa93c97b9fe605ad9c55967dbbc"
-=======
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.0.1.tgz#afda92cfd7e7363b1fbdb1a772dd63359a9ce96a"
->>>>>>> upstream/master
  dependencies:
    require-all "^2.2.0"
    vue-eslint-parser "^2.0.1"