@@ -2693,9 +2693,6 @@ camelcase-css@^2.0.1:
26932693 resolved "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz"
26942694 integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
26952695
2696- <<<<<<< HEAD
2697- caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001688 :
2698- =======
26992696camelize@^1.0.0 :
27002697 version "1.0.1"
27012698 resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3"
@@ -2707,7 +2704,6 @@ caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.300012
27072704 integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==
27082705
27092706caniuse-lite@^1.0.30001688 :
2710- >>>>>>> 6be2b020a0cabf2fd6dbff5c42c399b8ac323bca
27112707 version "1.0.30001692"
27122708 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz#4585729d95e6b95be5b439da6ab55250cd125bf9"
27132709 integrity sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==
@@ -2866,11 +2862,7 @@ color-name@1.1.3:
28662862 resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
28672863 integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
28682864
2869- <<<<<<< HEAD
2870- color-name@~1.1.4 :
2871- =======
2872- color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4 :
2873- >>>>>>> 6be2b020a0cabf2fd6dbff5c42c399b8ac323bca
2865+ color-name@^1.1.4, color-name@~1.1.4 :
28742866 version "1.1.4"
28752867 resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
28762868 integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -5070,9 +5062,9 @@ jiti@^1.19.1:
50705062 integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
50715063
50725064js-yaml@^3.13.1 :
5073- version "3.15.0 "
5074- resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.15.0 .tgz#586e5214eafe3e893756a41e979b50d89d3e4a67 "
5075- integrity sha512-ttBQIIQPDeLjpPOohtUdXuXUVoA2uIB6fEH9HyJ7234s5mBJ5wTx20njxplLZQgLaOfpmPQA7X2t5AX6tIPbog ==
5065+ version "3.15.1 "
5066+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.15.1 .tgz#24bc95028f361cdaaa84745b06a109c4486773c0 "
5067+ integrity sha512-S99WuO3HlhO3XN41EtYUNl9zzXjoJx7QvmipxsJVxtCBT0YHEFy+iOJhjSvrmV12nYhWpZaM8lPHkJm0yUMbag ==
50765068 dependencies :
50775069 argparse "^1.0.7"
50785070 esprima "^4.0.0"
0 commit comments