resolve merge conflict

src/components/Header/Header.jsx

@@ -55,9 +55,9 @@ function Header() {
                             <NavLink to="/volunteers" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                                 Bénévoles
                             </NavLink>
-                            {/*{user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
+                            {user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                                 Administration
-                            </NavLink>}*/}
+                            </NavLink>}
                         </div>
                     </div>
 
@@ -89,9 +89,9 @@ function Header() {
                     <NavLink to="/volunteers" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                         Bénévoles
                     </NavLink>
-                    {/*{user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
+                    {user.isAdmin && <NavLink to="/admin" className={({ isActive }) => isActive ? styles.activeLink : styles.link}>
                         Administration
-                    </NavLink>}*/}
+                    </NavLink>}
                 </nav>
 
 

src/layout.jsx

@@ -9,11 +9,11 @@ import { AuthContext } from "./contexts/auth/AuthContext.js";
 
 function Layout(){
 
-    /*const { user, loading } = useContext(AuthContext);
+    const { user, loading } = useContext(AuthContext);
 
     if (loading) return <p>Loading</p>;
     if (!user) return <Navigate to="/login" />;
-    if(user && user.validate === 0) return <Navigate to="/error/validation" />;*/
+    if(user && user.validate === 0) return <Navigate to="/error/validation" />;
 
     return (
         <div>