Feature/140 Conflict Resolve (#152)

* ✨ 유저 차단하기 API * 🎨 사용하지 않는 API 삭제 * ✨ 유저 차단 해지, 차단 목록 조회 API * Conflict Resolve * Conflict Resolve * Conflict Resolve
zipdabang · Oct 1, 2023 · 82a614f · 82a614f
1 parent ea3161f
commit 82a614f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java b/src/main/java/zipdabang/server/service/serviceImpl/MemberServiceImpl.java
@@ -75,11 +75,8 @@ public class MemberServiceImpl implements MemberService {
     private final DeregisterRepository deregisterRepository;
     private final DeregisterReasonRepository deregisterReasonRepository;
     private final BlockedMemberRepository blockedMemberRepository;
-<<<<<<< HEAD
-=======
 
     private final FollowRepository followRepository;
->>>>>>> a5dc21e0132e8f3e84329ab4d71729bbff08fef8
 
     @Value("${paging.size}")
     private Integer pageSize;

diff --git a/src/main/java/zipdabang/server/web/controller/MemberRestController.java b/src/main/java/zipdabang/server/web/controller/MemberRestController.java
@@ -24,10 +24,7 @@
 import zipdabang.server.base.Code;
 import zipdabang.server.base.ResponseDto;
 import zipdabang.server.base.exception.handler.MemberException;
-<<<<<<< HEAD
 import zipdabang.server.base.exception.handler.RecipeException;
-=======
->>>>>>> a5dc21e0132e8f3e84329ab4d71729bbff08fef8
 import zipdabang.server.converter.MemberConverter;
 import zipdabang.server.domain.Category;
 import zipdabang.server.domain.member.Follow;
@@ -416,7 +413,7 @@ else if (page < 1)
         Page<Member> blockedMembers = memberService.findBlockedMember(page, member);
         return ResponseDto.of(MemberConverter.toPagingMemberListDto(blockedMembers));
     }
-}
+
 
 
     @Operation(summary = "🎪팔로우하기 API", description = "팔로우하기 API 입니다.")