fix(#15): 오타 수정

Kusitms-28th-HDmedi-B · Sep 16, 2023 · f25a954 · f25a954
1 parent 293f38b
commit f25a954
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 55 deletions.
diff --git a/src/main/java/kusitms/hdmedi/domain/domain/News.java b/src/main/java/kusitms/hdmedi/domain/domain/News.java
diff --git a/src/main/java/kusitms/hdmedi/repository/news/NewsRepository.java b/src/main/java/kusitms/hdmedi/repository/news/NewsRepository.java
@@ -1,19 +1,10 @@
 package kusitms.hdmedi.repository.news;
 
-<<<<<<< HEAD
 import kusitms.hdmedi.domain.news.News;
-=======
-import kusitms.hdmedi.domain.domain.News;
->>>>>>> bfc8a2c214eba153895fecca239e41f0575e628d
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-<<<<<<< HEAD
-=======
-import java.util.List;
-
->>>>>>> bfc8a2c214eba153895fecca239e41f0575e628d
 public interface NewsRepository extends JpaRepository<News, Long> {
     Page<News> findAll(Pageable pageable);
 }