Skip to content

Commit fbbe434

Browse files
committed
fix: 충돌 수정
1 parent ea92e84 commit fbbe434

1 file changed

Lines changed: 0 additions & 21 deletions

File tree

README.md

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -604,10 +604,6 @@ const placeholderData = useMemo(() => generateFakeHeros(), []);
604604

605605
const {
606606
data,
607-
<<<<<<< HEAD
608-
refetch,
609-
=======
610-
>>>>>>> ccdcf43 (fix: 오탈자 수정)
611607
// ...
612608
} = useQuery({
613609
queryKey: ["super-heroes"],
@@ -732,29 +728,12 @@ const { data: user } = useQuery({
732728

733729
const channelId = user?.data.channelId;
734730

735-
<<<<<<< HEAD
736-
// user 쿼리에 종속 쿼리
737-
const { data: user } = useQuery({
738-
=======
739-
<<<<<<< HEAD
740-
// user 쿼리에 종속 쿼리
741-
const { data } = useQuery(
742-
['courses', channelId],
743-
() => fetchCoursesByChannelId(channelId),
744-
{ enabled: !!channelId }
745-
);
746-
=======
747731
// user 쿼리에 종속 쿼리
748732
const { data: courses } = useQuery({
749-
>>>>>>> ccdcf43 (fix: 오탈자 수정)
750733
queryKey: ["courses", channelId],
751734
queryFn: () => getCoursesByChannelId(channelId),
752735
enabled: !!channelId,
753736
});
754-
<<<<<<< HEAD
755-
=======
756-
>>>>>>> aea6c59 (fix: 오탈자 수정)
757-
>>>>>>> ccdcf43 (fix: 오탈자 수정)
758737
```
759738

760739
<br />

0 commit comments

Comments
 (0)