mirrors/VogelSocialMedia
1
0
Fork 0
mirror of https://github.com/bubblecup-12/VogelSocialMedia.git synced 2025-07-06 15:18:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflict

Browse source
This commit is contained in:
Ilay Eble 2025-06-11 16:07:42 +02:00 • committed by Luisa Bellitto
parent 2d1a4b590b
commit 45417a7732
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/frontend/src/App.tsx
View file

@ -4,12 +4,12 @@ import './App.css';
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import Footer from './Footer'; import Footer from './Footer';
import Header from './header'; import Header from './header';
import LoginAndSignUpPage from './LoginAndSignUpPage';
function App() { function App() {
return ( return (
<div className="App"> <div className="App">
<LoginAndSignUpPage></LoginAndSignUpPage> <Header/>
<Footer/>
</div> </div>
); );
} }