@@ -10882,26 +10882,15 @@ react-dev-utils@^4.2.1:
10882
10882
strip-ansi "3.0.1"
10883
10883
text-table "0.2.0"
10884
10884
10885
- <<<<<<< HEAD
10886
-
10887
- version "16.8.2"
10888
- resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.2.tgz#7c8a69545dd554d45d66442230ba04a6a0a3c3d3"
10889
- integrity sha512-cPGfgFfwi+VCZjk73buu14pYkYBR1b/SRMSYqkLDdhSEHnSwcuYTPu6/Bh6ZphJFIk80XLvbSe2azfcRzNF+Xg==
10890
- =======
10891
10885
10892
10886
version "16.8.3"
10893
10887
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.3.tgz#ae236029e66210783ac81999d3015dfc475b9c32"
10894
10888
integrity sha512-ttMem9yJL4/lpItZAQ2NTFAbV7frotHk5DZEHXUOws2rMmrsvh1Na7ThGT0dTzUIl6pqTOi5tYREfL8AEna3lA==
10895
- >>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
10896
10889
dependencies:
10897
10890
loose-envify "^1.1.0"
10898
10891
object-assign "^4.1.1"
10899
10892
prop-types "^15.6.2"
10900
- <<<<<<< HEAD
10901
- scheduler "^0.13.2"
10902
- =======
10903
10893
scheduler "^0.13.3"
10904
- >>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
10905
10894
10906
10895
react-error-overlay@^3.0.0:
10907
10896
version "3.0.0"
@@ -10955,26 +10944,15 @@ react-side-effect@^1.1.0:
10955
10944
exenv "^1.2.1"
10956
10945
shallowequal "^1.0.1"
10957
10946
10958
- <<<<<<< HEAD
10959
-
10960
- version "16.8.2"
10961
- resolved "https://registry.yarnpkg.com/react/-/react-16.8.2.tgz#83064596feaa98d9c2857c4deae1848b542c9c0c"
10962
- integrity sha512-aB2ctx9uQ9vo09HVknqv3DGRpI7OIGJhCx3Bt0QqoRluEjHSaObJl+nG12GDdYH6sTgE7YiPJ6ZUyMx9kICdXw==
10963
- =======
10964
10947
10965
10948
version "16.8.3"
10966
10949
resolved "https://registry.yarnpkg.com/react/-/react-16.8.3.tgz#c6f988a2ce895375de216edcfaedd6b9a76451d9"
10967
10950
integrity sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==
10968
- >>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
10969
10951
dependencies:
10970
10952
loose-envify "^1.1.0"
10971
10953
object-assign "^4.1.1"
10972
10954
prop-types "^15.6.2"
10973
- <<<<<<< HEAD
10974
- scheduler "^0.13.2"
10975
- =======
10976
10955
scheduler "^0.13.3"
10977
- >>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
10978
10956
10979
10957
read-all-stream@^3.0.0:
10980
10958
version "3.1.0"
@@ -11685,17 +11663,10 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.1, sax@~1.2.4:
11685
11663
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
11686
11664
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
11687
11665
11688
- <<<<<<< HEAD
11689
- scheduler@^0.13.2:
11690
- version "0.13.2"
11691
- resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.2.tgz#969eaee2764a51d2e97b20a60963b2546beff8fa"
11692
- integrity sha512-qK5P8tHS7vdEMCW5IPyt8v9MJOHqTrOUgPXib7tqm9vh834ibBX5BNhwkplX/0iOzHW5sXyluehYfS9yrkz9+w==
11693
- =======
11694
11666
scheduler@^0.13.3:
11695
11667
version "0.13.3"
11696
11668
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.3.tgz#bed3c5850f62ea9c716a4d781f9daeb9b2a58896"
11697
11669
integrity sha512-UxN5QRYWtpR1egNWzJcVLk8jlegxAugswQc984lD3kU7NuobsO37/sRfbpTdBjtnD5TBNFA2Q2oLV5+UmPSmEQ==
11698
- >>>>>>> de0dfde86f2d6c94e5430453ef86d7b376bc1b9b
11699
11670
dependencies:
11700
11671
loose-envify "^1.1.0"
11701
11672
object-assign "^4.1.1"
0 commit comments