merge conflict

hykim02 · hykim02 · commit c098a0ca69ab · 2025-03-27T17:28:50.000+09:00
diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java b/src/main/java/com/example/Jinus/service/v2/cafeteria/CafeteriaServiceV2.java
@@ -34,4 +34,4 @@ private String returnCafeteriaListCard(int campusId) {
         List<CafeteriaDto> cafeteriaList = cacheServiceV2.getCafeteriaList(campusId);
         return cafeteriaResponseServiceV2.createCafeteriaListCard(campusName, cafeteriaList);
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,4 @@ private String returnCafeteriaListCard(int campusId) {`
`34`	`34`	`List<CafeteriaDto> cafeteriaList = cacheServiceV2.getCafeteriaList(campusId);`
`35`	`35`	`return cafeteriaResponseServiceV2.createCafeteriaListCard(campusName, cafeteriaList);`
`36`	`36`	`}`
`37`		`-}`
	`37`	`+}`