From 42c4281276684c491b2be4d2288aef10117be473 Mon Sep 17 00:00:00 2001 From: Nicholas Orlowsky Date: Fri, 22 Apr 2022 15:38:41 -0500 Subject: [PATCH] actually merged --- package.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package.json b/package.json index 4c45546..b9f65f0 100644 --- a/package.json +++ b/package.json @@ -12,11 +12,7 @@ "@types/react": "^17.0.0", "@types/react-animate-on-scroll": "^2.1.2", "@types/react-dom": "^17.0.0", -<<<<<<< HEAD "@types/react-router-dom": "^5.3.3", -======= - "@types/react-router-dom": "^5.3.1", ->>>>>>> 8c84df02414fd057cd7f9392040d50522e98e12a "@types/react-slick": "^0.23.4", "@types/react-tabs": "^2.3.2", "@types/react-typing-animation": "^1.6.2", @@ -27,12 +23,7 @@ "react-animate-on-scroll": "^2.1.5", "react-bootstrap": "^1.6.1", "react-dom": "^17.0.2", -<<<<<<< HEAD "react-router-dom": "^6.3.0", -======= - "react-router": "^5.2.1", - "react-router-dom": "^5.3.0", ->>>>>>> 8c84df02414fd057cd7f9392040d50522e98e12a "react-scripts": "4.0.3", "react-slick": "^0.28.1", "react-snapshot": "^1.3.0",