Style : 주석 삭제

Guzzing · Nov 5, 2023 · ca6d5f0 · ca6d5f0
1 parent d512e3b
commit ca6d5f0
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/...in/java/org/guzzing/studayserver/domain/academy/repository/academy/AcademyRepository.java b/...in/java/org/guzzing/studayserver/domain/academy/repository/academy/AcademyRepository.java
@@ -1,7 +1,6 @@
 package org.guzzing.studayserver.domain.academy.repository.academy;
 
 import org.guzzing.studayserver.domain.academy.model.Academy;
-<<<<<<< HEAD
 import org.guzzing.studayserver.domain.academy.repository.AcademiesByLocation;
 import org.guzzing.studayserver.domain.academy.repository.AcademiesByName;
 import org.springframework.data.domain.Pageable;