Skip to content

Commit

Permalink
Fix: conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
JeongMin83 committed Jan 26, 2024
1 parent cdb74e1 commit 2f6d18b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/api/detail.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from 'axios';

import {MySpaces, placeInfoData, PlacesNearby, PostReview, Reviews, ReviewsRating, Wishes} from '@/types/detail';
import {MySpaces, placeInfoData, PlacesNearby, PostReview, ReviewsRating, Wishes} from '@/types/detail';

// --------------------------- GET ---------------------------

Expand Down
4 changes: 2 additions & 2 deletions src/components/Detail/Contents/Contents.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Tab, TabList, TabPanel, TabPanels, Tabs} from '@chakra-ui/react';
import {useEffect, useState} from 'react';
import {useEffect} from 'react';
import {useRecoilState, useSetRecoilState} from 'recoil';

import styles from './Contents.module.scss';
Expand All @@ -11,7 +11,7 @@ import Reviews from './Reviews/Reviews';
import {placeInfoDataPlace} from '@/types/detail';
// import {useGetReviews} from '@/hooks/Detail/useReviews';
// import {useParams} from 'react-router-dom';
import {useInfiniteScroll, useInfiniteScrollReviews} from '@/hooks/useInfiniteScroll';
import {useInfiniteScrollReviews} from '@/hooks/useInfiniteScroll';
import {useGetReviews} from '@/hooks/Detail/useReviews';

interface ContentsProps {
Expand Down

0 comments on commit 2f6d18b

Please sign in to comment.