From bfc5860b5b00825c3250522f830ffb17f2eafe16 Mon Sep 17 00:00:00 2001
From: Jun-te Kim <junte.kim@mealcraft.com>
Date: Mon, 5 Jan 2026 12:49:32 +0000
Subject: [PATCH] fix merge conflict

---
 src/app/portfolio/[slug]/(portfolio)/page.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/portfolio/[slug]/(portfolio)/page.tsx b/src/app/portfolio/[slug]/(portfolio)/page.tsx
index 8d5871d..ac6a829 100644
--- a/src/app/portfolio/[slug]/(portfolio)/page.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/page.tsx
@@ -81,12 +81,8 @@ export default async function Page(props: {
   return (
     <>
       <div className="flex justify-center">
-<<<<<<< HEAD
-          <div className="col-span-8 bg-white">
-=======
         <div className="grid grid-cols-11 w-full max-w-8xl">
           <div className="col-span-11 bg-white">
->>>>>>> f9ce0ea738308284245dd2fa2b5ed3f22d4700e9
             {properties.length === 0 ? (
               <EmptyPropertyState />
             ) : (
@@ -94,6 +90,7 @@ export default async function Page(props: {
             )}
           </div>
         </div>
+      </div>
     </>
   );
 }