Commit bb83e431 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Resolve yarn conflicts

parent dc203d2f
...@@ -1001,15 +1001,11 @@ bluebird@^2.10.2: ...@@ -1001,15 +1001,11 @@ bluebird@^2.10.2:
version "2.11.0" version "2.11.0"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
<<<<<<< HEAD
bluebird@^3.1.1: bluebird@^3.1.1:
version "3.4.7" version "3.4.7"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
bluebird@^3.3.0:
=======
bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.3.0: bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.3.0:
>>>>>>> ee/master
version "3.5.0" version "3.5.0"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
...@@ -5988,17 +5984,13 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2, supports-co ...@@ -5988,17 +5984,13 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2, supports-co
dependencies: dependencies:
has-flag "^1.0.0" has-flag "^1.0.0"
<<<<<<< HEAD
supports-color@^4.0.0, supports-color@^4.4.0: supports-color@^4.0.0, supports-color@^4.4.0:
version "4.5.0" version "4.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
dependencies: dependencies:
has-flag "^2.0.0" has-flag "^2.0.0"
supports-color@^4.2.1:
=======
supports-color@^4.0.0, supports-color@^4.2.1: supports-color@^4.0.0, supports-color@^4.2.1:
>>>>>>> ee/master
version "4.2.1" version "4.2.1"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
dependencies: dependencies:
......
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