Skip to content

Commit

Permalink
fix: fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kanghyun98 committed Sep 2, 2023
2 parents 6940422 + 5839bb6 commit c5eb280
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/pages/mypage/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import MainHeader from '@/components/common/MainHeader';
import { ReactComponent as SettingIcon } from '@/assets/icons/SettingIcon.svg';
import { useLogout } from '@/hooks/useAuth';

import * as styles from './mypage.css';
import ContentBox from '@/components/common/ContentBox';
import TextButton from '@/components/common/TextButton';
import { COLORS } from '@/constants/styles';

import * as styles from './mypage.css';

const MyPage = () => {
const logout = useLogout();

Expand Down

0 comments on commit c5eb280

Please sign in to comment.