Schemas in backend schemas.go

frontend/components/nav-bar.tsx

@@ -69,7 +69,7 @@ const subMenuItemsTwo = [
 const Navbar = () => {
 	return (
 		<section className="p-4 bg-white top-0 sticky z-[100]">
-			<div className="">
+			<div>
 				<nav className="hidden justify-between lg:flex">
 					<div className="flex items-center gap-6">
 						<div className="flex items-center gap-2">
@@ -103,15 +103,8 @@ const Navbar = () => {
 										variant: "ghost",
 									}),
 								)}
-<<<<<<< HEAD:latosa-frontend/components/nav-bar.tsx
-
 								href="/">
 								Planning	
-=======
-								href="/"
-							>
-								Calendar
->>>>>>> dev/cedric:frontend/components/nav-bar.tsx
 							</a>
 							<a
 								className={cn(