diff --git a/app/routes/news.tsx b/app/routes/news.tsx index 6d132a5..c7e1696 100755 --- a/app/routes/news.tsx +++ b/app/routes/news.tsx @@ -5,12 +5,9 @@ import CultureBgPage from "@/components/news/body/Culturebg"; import {Header} from "@/components/news/header/Header"; import {TopNav} from "@/components/news/header/TopNav"; import NewsList from "@/components/list/NewsList"; -<<<<<<< HEAD import ImageGridSection from "@/components/body/ImageGridSection"; import { CarouselDemo } from "@/components/Carousel"; -======= import GrassrootsDynamics from "@/components/body/GrassrootsDynamics"; ->>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8 export function meta( ) { return [ { title: "New React Router App" }, @@ -26,12 +23,9 @@ export default function Home() { -<<<<<<< HEAD - {/* */} + -======= ->>>>>>> 858176d3dcd4442d093f13eeca279711b756adb8 ); }