merging.

src/features/layout/page.tsx

@@ -2,17 +2,8 @@ import {twx} from "@/lib/twx";
 import {cn} from "@/lib/utils";
 
 
-<<<<<<< HEAD
 export const Page = twx.div((props) => [
-    cn(`flex flex-col h-full px-10 py-6`, props.className),
+    cn(`flex flex-col h-full px-10 py-6`, props.className)
-=======
-export const PageHeader = twx.div((props)=>[
-    cn(`flex justify-between`, props.className),
-])
-
-export const PageTitle = twx.h1((props)=>[
-    cn(`text-3xl font-bold mb-6`, props.className),
->>>>>>> origin/main
 ])
 
 
@@ -31,17 +22,11 @@ export const PageDescription = twx.h2((props) => [
 ])
 
 
-<<<<<<< HEAD
 export const PageActions = twx.h1((props) => [
         cn(`flex gap-4 h-fit`, props.className),
-])
+    ]
+)
 
 export const PageContent = twx.div((props) => [
-    cn(`h-full`, props.className),
+    cn(`h-full`, props.className)
-=======
-export const PageActions = twx.h1((props)=>[
-    cn(`flex gap-4`, props.className),
->>>>>>> origin/main
 ])
-
-