merge de la dev

WildCodeSchool · Feb 13, 2025 · 26a8907 · 26a8907
1 parent a2512ab
commit 26a8907
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
@@ -8,14 +8,7 @@ const rootElement = document.getElementById('root') as HTMLElement;
 const root = ReactDOM.createRoot(rootElement);
 
 root.render(
-<<<<<<< HEAD
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>
-);
-=======
     <React.StrictMode>
         <App />
     </React.StrictMode>,
 );
->>>>>>> 432cea1 (initialisation tailwind)