Skip to content

Commit d46592e

Browse files
committed
resolve conflit
1 parent aace5bb commit d46592e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@
7979
"@types/jest": "25.2.3",
8080
"@types/lodash": "4.14.149",
8181
"@types/react": "17.0.45",
82+
"@types/react-dom": "17.0.17",
8283
"@types/react-addons-shallow-compare": "0.14.17",
8384
"@types/react-addons-test-utils": "0.14.15",
8485
"@types/react-addons-update": "0.14.21",
85-
"@types/react-dom": "17.0.17",
8686
"@types/react-mentions": "^4.1.3",
8787
"@types/sinon": "2.3.4",
8888
"@types/webpack-env": "~1.15.2",

0 commit comments

Comments
 (0)