From 138379bcf1d96004cea1d3fc6a30be485cd640c2 Mon Sep 17 00:00:00 2001
From: white <122345776@umail.ucc.ie>
Date: Mon, 3 Mar 2025 15:37:39 +0000
Subject: [PATCH] FIX: solved merge conflicts

---
 frontend/src/App.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index ead5d55..baeeb97 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -15,12 +15,7 @@ import DashboardPage from "./pages/DashboardPage";
 import { Brightness } from "./context/BrightnessContext";
 import LoadingScreen from "./components/Layout/LoadingScreen";
 import Following from "./pages/Following";
-<<<<<<< HEAD
-import FollowedCategories from "./pages/FollowedCategories";
-import UnsubscribeForm from "./components/Auth/UnsubscribeForm";
 import UnsubscribePage from "./pages/UnsubscribePage";
-=======
->>>>>>> 2494e40ffd09ee704397c812f63d03bb7ec156f1
 
 function App() {
 	const [isLoggedIn, setIsLoggedIn] = useState(false);
@@ -76,7 +71,7 @@ function App() {
 								<Route path="/:streamerName" element={<StreamerRoute />} />
 								<Route path="/user/:username" element={<UserPage />} />
 								<Route path="/reset_password/:token" element={<ResetPasswordPage />}></Route>
-								<Route path="user/unsubscribe/:token" element={<UnsubscribePage />}></Route>
+								<Route path="/user/unsubscribe/:token" element={<UnsubscribePage />}></Route>
 								<Route path="/category/:categoryName" element={<CategoryPage />}></Route>
 								<Route path="/categories" element={<CategoriesPage />}></Route>
 								<Route path="/results" element={<ResultsPage />}></Route>