fixing conflicts merge

Arquisoft · Mar 28, 2024 · f211429 · f211429
1 parent ef2dada
commit f211429
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 3 deletions.
diff --git a/webapp/src/components/AboutUs.js b/webapp/src/components/AboutUs.js
@@ -9,7 +9,6 @@ const AboutUs = () => {
       <div className='video-background'>
         <video src='/clouds-background.mp4' autoPlay loop muted data-testid="login-video"/>
       </div>
-      <NavigationBar />
       <Typography component="h1" variant="h1" marginBottom={2}>
         About us
       </Typography>

diff --git a/webapp/src/components/Home.js b/webapp/src/components/Home.js
@@ -28,7 +28,6 @@ const Home = () => {
       <div className='video-background'>
         <video src='/clouds-background.mp4' autoPlay loop muted data-testid="home-video"/>
       </div>
-      <NavigationBar />
       <div className='logoContainer'>
         <img src={logo} alt="Logo" className="logo" style={{ width: '100px', position: 'relative', left: '50%', transform: 'translate(-50%, -50%)' }} />
       </div>

diff --git a/webapp/src/components/Record.js b/webapp/src/components/Record.js
@@ -35,7 +35,6 @@ const Record = () => {
       <div className='video-background'>
         <video src='/clouds-background.mp4' autoPlay loop muted data-testid="home-video"/>
       </div>
-      <NavigationBar />
       <Typography component="h1" variant="h5">
         Here you can see your record! All about your past games and all!
       </Typography>