Skip to content

Commit fc4cfdf

Browse files
committed
fix: merge 충돌 해결
1 parent 941a5b8 commit fc4cfdf

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

src/pages/main/ui/MainPage.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
import { ChatCircleCloseIcon, GearIcon, SellIcon, ShoppingIcon } from '@shared/assets/icons';
1+
import { ChatCircleCloseIcon } from '@shared/assets/icons';
22
import { ROUTES } from '@shared/constants';
33
import { useToast } from '@shared/hooks';
44
import { BannerCard } from '@shared/ui/BannerCard';
55
import { Carousel3D } from '@shared/ui/Carousel3D';
66
import { ChatbotFloatingButton } from '@shared/ui/ChatbotFloatingButton';
7+
import { ClientOnly } from '@shared/ui/ClientOnly';
78
import { useEffect, useRef } from 'react';
89
import { useLocation, useNavigate } from 'react-router';
10+
import { BANNER_CARDS } from './BannerCards';
11+
import { CAROUSEL_SLIDES } from './CarouselSlides';
912

1013
type MainLocationState = {
1114
deleted?: boolean;
1215
};
13-
import { ClientOnly } from '@shared/ui/ClientOnly';
14-
import { useNavigate } from 'react-router';
15-
import { BANNER_CARDS } from './BannerCards';
16-
import { CAROUSEL_SLIDES } from './CarouselSlides';
1716

1817
export default function MainPage() {
1918
const location = useLocation();

0 commit comments

Comments
 (0)