merge conflict

Gongjakso · May 22, 2024 · f011ac9 · f011ac9
2 parents 26c7a0e + ec05b30
commit f011ac9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/main/java/com/gongjakso/server/domain/post/service/PostService.java b/src/main/java/com/gongjakso/server/domain/post/service/PostService.java
@@ -397,7 +397,6 @@ public Page<GetContestRes> getMyScrapContest(Member member, Pageable page){
         Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize());
 
         Page<PostScrap> scrapPageList = postScrapRepository.findAllByMemberAndPostPostTypeFalseAndPostDeletedAtIsNullAndScrapStatusTrueOrderByPostScrapIdDesc(member, pageable);
-
         List<GetContestRes> myScrapContests = scrapPageList.stream()
                 .map(scrap -> {
                     Post post = scrap.getPost();