merge conflict fixed

This commit is contained in:
2024-12-11 16:50:34 -05:00
parent e26ffde6c0
commit 7d9018ecb1
8 changed files with 418 additions and 36 deletions

View File

@@ -1,9 +1,9 @@
import About from "../components/site/About";
import Contact from "../components/site/Contact";
import FeaturesSection from "../components/FeaturesSection";
import Footer from "../components/site/Footer ";
import Header from "../components/Header";
import Hero from "../components/Hero";
import About from "@components/site/About";
import Contact from "@components/site/Contact";
import FeaturesSection from "@components/FeaturesSection";
import Footer from "@components/site/Footer";
import Header from "@components/Header";
import Hero from "@components/Hero";
export default async function Home() {