[feat/#12] 충돌 해결

woals2840 · woals2840 · commit f15220c6e51d · 2025-05-18T04:37:47.000+09:00
diff --git a/src/main/java/com/sopkathon/domain/subway/service/SubwayService.java b/src/main/java/com/sopkathon/domain/subway/service/SubwayService.java
@@ -40,8 +40,4 @@ public SubwayListRes getSubwayListByKeyword(String keyword) {
     public SubwayEntity getSubwayEntity(String subwayName) {
         return subwayRepository.findBySubwayName(subwayName);
     }
-
-    public SubwayEntity getSubwayEntity(String subwayName) {
-        return subwayRepository.findBySubwayName(subwayName);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,4 @@ public SubwayListRes getSubwayListByKeyword(String keyword) {`
`40`	`40`	`public SubwayEntity getSubwayEntity(String subwayName) {`
`41`	`41`	`return subwayRepository.findBySubwayName(subwayName);`
`42`	`42`	`}`
`43`		`-`
`44`		`- public SubwayEntity getSubwayEntity(String subwayName) {`
`45`		`- return subwayRepository.findBySubwayName(subwayName);`
`46`		`- }`
`47`	`43`	`}`