From 98d5fb84b6838b86125d6e691a13f6028a726391 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Tue, 18 Nov 2025 17:24:46 +0800
Subject: [PATCH] 1

---
 app/components/Carousel.tsx | 15 ---------------
 app/routes/news.tsx         |  1 +
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/app/components/Carousel.tsx b/app/components/Carousel.tsx
index eb036a4..cd314d8 100755
--- a/app/components/Carousel.tsx
+++ b/app/components/Carousel.tsx
@@ -11,11 +11,8 @@ import {
   CarouselPrevious,
   type CarouselApi,
 } from "@/ui/carousel";
-<<<<<<< HEAD:app/components/untils/Carousel.tsx
 import FireNewsList from "./FireNewsList";
-=======
   const imageUrls = [
->>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
 
   "/images/carousel-1.jpg",
   "/images/carousel-2.jpg",
@@ -62,24 +59,12 @@ export function CarouselDemo() {
             <CarouselItem key={index}>
               <div className="p-1">
                 <Card>
-<<<<<<< HEAD:app/components/untils/Carousel.tsx
-                  <CardContent className="flex aspect-square items-center justify-center ">
-                    <div 
-                    className="w-full h-full"
-                    style={{
-                      backgroundImage: "url('/app/images/header.png')",
-                      backgroundSize: '100% 100%',
-                    }}
-                    >
-                    </div>
-=======
                   <CardContent className="flex aspect-square items-center justify-center p-6">
                      <img
                       src={src}
                       alt={`Slide ${index + 1}`}
                       className="w-full h-full object-cover"
                     />
->>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
                   </CardContent>
                 </Card>
               </div>
diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index dd1e84b..8fd0b82 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -16,6 +16,7 @@ export default function Home() {
     <div>
       <Header />
       <TopNav />
+      
       <NewsList />
       <ImageGridSection />
     </div>