Compare commits
No commits in common. "e6b12574b4e382fa8cbb44cac1c71d7525acb844" and "3aaf78c0dfbb76d2b52878197c42493254d73c08" have entirely different histories.
e6b12574b4
...
3aaf78c0df
|
|
@ -2,8 +2,8 @@
|
|||
import type { Route } from "./+types/news";
|
||||
import Integrated from "@/components/news/body/Integrated";
|
||||
import CultureBgPage from "@/components/news/body/Culturebg";
|
||||
import {Header} from "@/components/news/header/Header";
|
||||
import {TopNav} from "@/components/news/header/TopNav";
|
||||
import {Header} from "@/components/header/Header";
|
||||
import {TopNav} from "@/components/header/TopNav";
|
||||
import NewsList from "@/components/list/NewsList";
|
||||
<<<<<<< HEAD
|
||||
import ImageGridSection from "@/components/body/ImageGridSection";
|
||||
|
|
|
|||
Loading…
Reference in New Issue