From b48d162d4311ad0ec8ce39679bb29799a05096ad Mon Sep 17 00:00:00 2001
From: EvanLin3141 <Evan.lin.3141@gmail.com>
Date: Tue, 4 Feb 2025 18:00:43 +0000
Subject: [PATCH] FIX: Error Fix in Previous Commit

---
 frontend/src/components/Layout/Navbar.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/components/Layout/Navbar.tsx b/frontend/src/components/Layout/Navbar.tsx
index 6e9aefe..49b8e2a 100644
--- a/frontend/src/components/Layout/Navbar.tsx
+++ b/frontend/src/components/Layout/Navbar.tsx
@@ -22,12 +22,7 @@ const Navbar: React.FC<NavbarProps> = ({
 }) => {
   const [showAuthModal, setShowAuthModal] = useState(false);
   const { isLoggedIn } = useAuth();
-<<<<<<< HEAD
-  const isVideoPage = location.pathname.includes("/EduGuru");
   const [showSideBar, setShowSideBar] = useState(false);
-=======
->>>>>>> 595190b0a004153d7253d5a44ae09e5d892a1bef
-
   useEffect(() => {
     if (showAuthModal) {
       document.body.style.overflow = "hidden";