File tree Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change 26
26
"@testing-library/react-native" : " 7.2.0" ,
27
27
"@types/jest" : " 27.0.2" ,
28
28
"@types/react" : " 16.14.17" ,
29
- "@types/react-native" : " 0.62.18 " ,
29
+ "@types/react-native" : " 0.64.12 " ,
30
30
"all-contributors-cli" : " 6.15.0" ,
31
31
"auto" : " 9.26.8" ,
32
32
"eslint" : " 7.3.1" ,
Original file line number Diff line number Diff line change 1868
1868
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
1869
1869
integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
1870
1870
1871
+ <<<<<<< HEAD
1871
1872
" @types/react-dom@>=16.9.0 " :
1872
1873
version "17.0.9"
1873
1874
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
1879
1880
version "0.62.18"
1880
1881
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.62.18.tgz#ad63691e7c44edef2beeb6af52b2eb942c3ed8a1"
1881
1882
integrity sha512-7QfU8EzIYxYqeXpPf8QNv2xi8hrePlgTbRATRo+plRSdVfJu7N6sAXqrFxKJp6bGLvp82GV1gczl93gqiAfXPA==
1883
+ =======
1884
+
1885
+ version "0.64.12"
1886
+ resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.64.12.tgz#1c6a3226c26d7a5949cdf8878e6cfe95fe0951d6"
1887
+ integrity sha512-sw6WGSaL219zqrgdb4kQUtFB9iGXC/LmecLZ+UUWEgwYvD0YH81FqWYmONa2HuTkOFAsxu2bK4DspkWRUHIABQ==
1888
+ >>>>>>> 3339af8 (⬆️ Upgrade @types/react-native, fixing missing type)
1882
1889
dependencies :
1883
1890
" @types/react" " *"
1884
1891
You can’t perform that action at this time.
0 commit comments