fix conflict
This commit is contained in:
parent
b9a9dba8f1
commit
8dc3f544d7
@ -5,20 +5,6 @@ import Blog from "./Blogs/Blog";
|
|||||||
import Cta3 from "./cta3";
|
import Cta3 from "./cta3";
|
||||||
import Facts from "./Facts";
|
import Facts from "./Facts";
|
||||||
import Service from "./Service";
|
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 }) {
|
export default function homepage({ onePage = false, dark = false }) {
|
||||||
return (
|
return (
|
||||||
|
Loading…
x
Reference in New Issue
Block a user