From 45417a773264eaa9d0832fc831446ad12c13abe6 Mon Sep 17 00:00:00 2001
From: Ilay Eble <ilayeble@gmail.com>
Date: Wed, 11 Jun 2025 16:07:42 +0200
Subject: [PATCH] merge conflict

---
 code/frontend/src/App.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/frontend/src/App.tsx b/code/frontend/src/App.tsx
index 917c5d6..8b6c033 100644
--- a/code/frontend/src/App.tsx
+++ b/code/frontend/src/App.tsx
@@ -4,12 +4,12 @@ import './App.css';
 import { useState, useEffect } from 'react';
 import Footer from './Footer';
 import Header from './header';
-import LoginAndSignUpPage from './LoginAndSignUpPage';
 
 function App() {
   return (
     <div className="App">
-      <LoginAndSignUpPage></LoginAndSignUpPage>
+      <Header/>
+      <Footer/>
     </div>
   );
 }