Merge pull request #74 from FixLog/sungchaewon-patch-3

Update MypagePostController.java

Author: sungchaewon

src/main/java/com/example/FixLog/controller/MypagePostController.java

@@ -33,20 +33,6 @@ public ResponseEntity<Response<PageResponseDto<MyPostPageResponseDto>>> getMyPos
         return ResponseEntity.ok(Response.success("내가 작성한 글 보기 성공", data));
     }
 
-<<<<<<< HEAD
-   // 내가 좋아요한 글
-   @GetMapping("/likes")
-   public ResponseEntity<Response<PageResponseDto<MyPostPageResponseDto>>> getLikedPosts(
-           @AuthenticationPrincipal UserDetails userDetails,
-           @RequestParam(defaultValue = "0") int page,
-           @RequestParam(defaultValue = "4") int size,
-           @RequestParam(defaultValue = "0") int sort) {
-
-       String email = userDetails.getUsername();
-       PageResponseDto<MyPostPageResponseDto> result = mypagePostService.getLikedPosts(email, page, sort, size);
-       return ResponseEntity.ok(Response.success("내가 좋아요한 글 보기 성공", result));
-   }
-=======
     // 내가 좋아요한 글
     @GetMapping("/likes")
     public ResponseEntity<Response<PageResponseDto<MyPostPageResponseDto>>> getLikedPosts(
@@ -58,8 +44,7 @@ public ResponseEntity<Response<PageResponseDto<MyPostPageResponseDto>>> getLiked
         String email = userDetails.getUsername();
         PageResponseDto<MyPostPageResponseDto> result = mypagePostService.getLikedPosts(email, page, sort, size);
         return ResponseEntity.ok(Response.success("내가 좋아요한 글 보기 성공", result));
-    }
->>>>>>> origin/develop
+
 
 
 }