From fe548c3a2d6760a131b888d52247dbc4b0c17779 Mon Sep 17 00:00:00 2001
From: zahravaziri <zahra.vaziri1920@gmail.com>
Date: Sun, 1 Jun 2025 12:03:41 +0330
Subject: [PATCH] pull main

---
 src/app/page.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 64567a4..20fcbd6 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,8 +1,5 @@
 // ... existing imports ...
-<<<<<<< HEAD
 import Navbar from '@/components/layout/navbar';
-=======
->>>>>>> 489e65224a31d72e06ac62b08e200ebb42b171b3
 
 async function getData() {
   // Simulate a delay to show server-side data fetching