From 8dc3f544d7a8a4a2dd91d32dd751245290198da9 Mon Sep 17 00:00:00 2001
From: iqbal024 <muhammadiqbalalikhadafi@gmail.com>
Date: Wed, 12 Feb 2025 21:33:50 +0700
Subject: [PATCH] fix conflict

---
 src/components/Homepage.tsx | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/components/Homepage.tsx b/src/components/Homepage.tsx
index 1b2ea71..0865447 100644
--- a/src/components/Homepage.tsx
+++ b/src/components/Homepage.tsx
@@ -5,20 +5,6 @@ import Blog from "./Blogs/Blog";
 import Cta3 from "./cta3";
 import Facts from "./Facts";
 import Service from "./Service";
-<<<<<<< HEAD
-import Image from "next/image";
-import Testimonials from "./Testimonials";
-import Blog from "./Blogs/Blog";
-import Newsletter from "./Newsletter";
-import Contact from "./Contacts/Contact";
-import Link from "next/link";
-import TestimonialsDark from "./TestimonialsDark";
-import ContactDark from "./ContactDark";
-import { features4 } from "@/data/features";
-import Cta3 from "./cta3";
-import { fetchBlog } from "@/services/payload/blog";
-=======
->>>>>>> a16f9d0ca8184e03b85217be1656938178f0ce00
 
 export default function homepage({ onePage = false, dark = false }) {
   return (