amir/Account
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
Koosha Lahouti
2025-07-18 21:30:47 +03:30
parent e2ff5c9483
commit bdf6af0b36
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/App.tsx
View File

@@ -7,11 +7,11 @@ import {
useColorScheme, useColorScheme,
} from '@mui/material'; } from '@mui/material';
import './App.css'; import './App.css';
<<<<<<< HEAD
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { LanguageManager } from './components/LanguageManager'; import { LanguageManager } from './components/LanguageManager';
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
>>>>>>> f1620b6 (fix: issue in user profile) >>>>>>> f1620b6 (fix: issue in user profile)
@@ -21,11 +21,12 @@ import { UserProfileForm } from './features/profile/components/UserProfileForm';
>>>>>>> 3698cbf (feat: implement user profile form) >>>>>>> 3698cbf (feat: implement user profile form)
>>>>>>> f9815fb (fix: issue in user profile) >>>>>>> f9815fb (fix: issue in user profile)
=======
>>>>>>> 2a79376 (fix: merge conflict)
function App() { function App() {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<<<<<<< HEAD
<> <>
<CssBaseline /> <CssBaseline />
<LanguageManager /> <LanguageManager />
@@ -54,11 +55,6 @@ function App() {
</Box> </Box>
</div> </div>
</> </>
=======
<div>
<UserProfileForm />
</div>
>>>>>>> 3698cbf (feat: implement user profile form)
); );
} }