Skip to content

Commit 921c32a

Browse files
committed
fix yarn.lock after resolving conflicts of #250
1 parent ad5f274 commit 921c32a

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

yarn.lock

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2426,6 +2426,15 @@ cmd-shim@^2.0.2:
24262426
graceful-fs "^4.1.2"
24272427
mkdirp "~0.5.0"
24282428

2429+
coa@^2.0.2:
2430+
version "2.0.2"
2431+
resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
2432+
integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
2433+
dependencies:
2434+
"@types/q" "^1.5.1"
2435+
chalk "^2.4.1"
2436+
q "^1.1.2"
2437+
24292438
coa@~1.0.1:
24302439
version "1.0.4"
24312440
resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
@@ -2749,14 +2758,6 @@ csso@~2.3.1:
27492758
clap "^1.0.9"
27502759
source-map "^0.5.3"
27512760

2752-
csso@~2.3.1:
2753-
version "2.3.2"
2754-
resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
2755-
integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
2756-
dependencies:
2757-
clap "^1.0.9"
2758-
source-map "^0.5.3"
2759-
27602761
currently-unhandled@^0.4.1:
27612762
version "0.4.1"
27622763
resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -4856,6 +4857,14 @@ js-yaml@^3.12.0, js-yaml@^3.9.0:
48564857
argparse "^1.0.7"
48574858
esprima "^4.0.0"
48584859

4860+
js-yaml@^3.13.1:
4861+
version "3.13.1"
4862+
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
4863+
integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
4864+
dependencies:
4865+
argparse "^1.0.7"
4866+
esprima "^4.0.0"
4867+
48594868
js-yaml@~3.7.0:
48604869
version "3.7.0"
48614870
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"

0 commit comments

Comments
 (0)