actually merged

This commit is contained in:
Nicholas Orlowsky 2022-04-22 15:38:41 -05:00
parent 0eae4c00ca
commit 42c4281276
No known key found for this signature in database
GPG key ID: 3845F78A73B14100

View file

@ -12,11 +12,7 @@
"@types/react": "^17.0.0", "@types/react": "^17.0.0",
"@types/react-animate-on-scroll": "^2.1.2", "@types/react-animate-on-scroll": "^2.1.2",
"@types/react-dom": "^17.0.0", "@types/react-dom": "^17.0.0",
<<<<<<< HEAD
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
=======
"@types/react-router-dom": "^5.3.1",
>>>>>>> 8c84df02414fd057cd7f9392040d50522e98e12a
"@types/react-slick": "^0.23.4", "@types/react-slick": "^0.23.4",
"@types/react-tabs": "^2.3.2", "@types/react-tabs": "^2.3.2",
"@types/react-typing-animation": "^1.6.2", "@types/react-typing-animation": "^1.6.2",
@ -27,12 +23,7 @@
"react-animate-on-scroll": "^2.1.5", "react-animate-on-scroll": "^2.1.5",
"react-bootstrap": "^1.6.1", "react-bootstrap": "^1.6.1",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
<<<<<<< HEAD
"react-router-dom": "^6.3.0", "react-router-dom": "^6.3.0",
=======
"react-router": "^5.2.1",
"react-router-dom": "^5.3.0",
>>>>>>> 8c84df02414fd057cd7f9392040d50522e98e12a
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"react-slick": "^0.28.1", "react-slick": "^0.28.1",
"react-snapshot": "^1.3.0", "react-snapshot": "^1.3.0",