fix conflict in yarn.lock

a00730ea · Lukas Eipert · 3cef5835 · a00730ea
Commit a00730ea authored Sep 07, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

yarn.lock yarn.lock +0 -6

No files found.
--- a/yarn.lock
+++ b/yarn.lock
@@ -1366,15 +1366,9 @@ bootstrap-vue@^2.0.0-rc.11:
    popper.js "^1.12.9"
    vue-functional-data-merge "^2.0.5"

-<<<<<<< HEAD
-bootstrap@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
-=======
 bootstrap@^4.1.1, bootstrap@~4.1.1:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.2.tgz#aee2a93472e61c471fc79fb475531dcbc87de326"
->>>>>>> upstream/master

 boxen@^1.2.1:
  version "1.3.0"