qiuchenfan
/
news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: qiuchenfan:e6b12574b4e382fa8cbb44cac1c71d7525acb844
Branches Tags
qiuchenfan:main
..
compare: qiuchenfan:3aaf78c0dfbb76d2b52878197c42493254d73c08
Branches Tags
qiuchenfan:main

No commits in common. "e6b12574b4e382fa8cbb44cac1c71d7525acb844" and "3aaf78c0dfbb76d2b52878197c42493254d73c08" have entirely different histories.
e6b12574b4 ... 3aaf78c0df

3 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

0
app/components/news/header/Header.tsx → app/components/header/Header.tsx
View File

0
app/components/news/header/TopNav.tsx → app/components/header/TopNav.tsx
View File

4
app/routes/news.tsx
View File

@ -2,8 +2,8 @@
import type { Route } from "./+types/news"; import type { Route } from "./+types/news";
import Integrated from "@/components/news/body/Integrated"; import Integrated from "@/components/news/body/Integrated";
import CultureBgPage from "@/components/news/body/Culturebg"; import CultureBgPage from "@/components/news/body/Culturebg";
import {Header} from "@/components/news/header/Header"; import {Header} from "@/components/header/Header";
import {TopNav} from "@/components/news/header/TopNav"; import {TopNav} from "@/components/header/TopNav";
import NewsList from "@/components/list/NewsList"; import NewsList from "@/components/list/NewsList";
<<<<<<< HEAD <<<<<<< HEAD
import ImageGridSection from "@/components/body/ImageGridSection"; import ImageGridSection from "@/components/body/ImageGridSection";