fix : resolve merge conflict:3

KGU6 · Sep 28, 2024 · 878bb53 · 878bb53
2 parents 0e8745c + 131fdb9
commit 878bb53
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/main/java/com/kakaogroom6/server/domain/profile/service/ProfileService.java b/src/main/java/com/kakaogroom6/server/domain/profile/service/ProfileService.java
@@ -13,9 +13,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/src/main/java/com/kakaogroom6/server/domain/travelog/service/TravelogService.java b/src/main/java/com/kakaogroom6/server/domain/travelog/service/TravelogService.java
@@ -17,7 +17,6 @@
 import com.kakaogroom6.server.domain.travelog.repository.TravelogRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.time.format.DateTimeFormatter;
 
@@ -149,4 +148,5 @@ private void savePlaces(List<CreateOnePlaceRequestDTO> places, TravelogEntity tr
             }
         }
     }
+
 }