@@ -2700,21 +2700,12 @@ camelcase-css@^2.0.1:
27002700 resolved "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz"
27012701 integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
27022702
2703- <<<<<<< HEAD
2704- 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 :
2705- =======
27062703camelize@^1.0.0 :
27072704 version "1.0.1"
27082705 resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3"
27092706 integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
27102707
2711- 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 :
2712- version "1.0.30001636"
2713- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz#b15f52d2bdb95fad32c2f53c0b68032b85188a78"
2714- integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==
2715-
2716- caniuse-lite@^1.0.30001688 :
2717- >>>>>>> 6be2b020a0cabf2fd6dbff5c42c399b8ac323bca
2708+ 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 :
27182709 version "1.0.30001692"
27192710 resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz#4585729d95e6b95be5b439da6ab55250cd125bf9"
27202711 integrity sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==
@@ -2873,11 +2864,7 @@ color-name@1.1.3:
28732864 resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
28742865 integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
28752866
2876- <<<<<<< HEAD
2877- color-name@~1.1.4 :
2878- =======
28792867color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4 :
2880- >>>>>>> 6be2b020a0cabf2fd6dbff5c42c399b8ac323bca
28812868 version "1.1.4"
28822869 resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
28832870 integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
0 commit comments