1

2025-11-20 08:23:30 +08:00 · 2025-11-20 08:23:30 +08:00 · 36f6c586aa
parent a2ff340b4d
commit 36f6c586aa
1 changed files with 0 additions and 4 deletions
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@ -14,10 +14,6 @@ import { Hotline } from "@/components/news/body/FireNews/Hotline";
 import { AutoCarouselDemo } from "@/components/AutoCarousel";
 import { Footer } from "@/components/news/footer/footer";
 import { CarouselDemo } from "@/components/Carousel";
-<<<<<<< HEAD
-=======
-
->>>>>>> c14daff3c048d7b97f1a2e62ab201d234aaf0e77

 export function meta( ) {
  return [