diff --git a/src/app/private/[uid]/user/layout.tsx b/src/app/private/[uid]/user/layout.tsx index 4cf917fa..7277efa2 100644 --- a/src/app/private/[uid]/user/layout.tsx +++ b/src/app/private/[uid]/user/layout.tsx @@ -1,10 +1,6 @@ "use client"; -<<<<<<< HEAD import { CollapsableSidebarContainer } from "@components/container"; -======= -import Sidebar, { ISideBar } from "@components/Sidebar"; ->>>>>>> 9bd5bd7 (finish first draft) import { faHome, faUsers, faUser } from "@fortawesome/free-solid-svg-icons"; import React, { useContext } from "react"; import { UserContext } from "src/context/UserProvider"; diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index 6983941f..b18b4cb6 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -12,11 +12,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { UserContext } from "src/context/UserProvider"; import Logo from "@public/icons/logo.svg"; import Image from "next/image"; -<<<<<<< HEAD import { RoleAlias } from "@constants/RoleAlias"; import { fullName } from "@utils"; -======= ->>>>>>> 9bd5bd7 (finish first draft) interface Button { name: string; @@ -101,7 +98,6 @@ const Sidebar = (props: ISideBar) => {