수정

kdt-8-4 · Dec 2, 2023 · 5986500 · 5986500
1 parent 1d83122
commit 5986500
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/main/java/com/weatherfit/board/dto/BoardUpdateDTO.java b/src/main/java/com/weatherfit/board/dto/BoardUpdateDTO.java
@@ -3,6 +3,7 @@
 import com.weatherfit.board.domain.ImageEntity;
 import lombok.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import java.util.List;
 
 @Getter
@@ -14,9 +15,6 @@ public class BoardUpdateDTO {
     private List<String> category;
     private List<String> hashTag;
     private List<ImageEntity> images;
-<<<<<<< HEAD
     private String[] deletedImages;
-=======
-       private String[] deletedImages;
->>>>>>> 2ca267785a1aa67187f05e2b056b70f571d417bf
+
 }