[LINKER-X] fix: resolve conflict

YAPP-Github · Feb 20, 2024 · 147a5e5 · 147a5e5
1 parent a6c5ca5
commit 147a5e5
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/domain/src/main/java/com/imlinker/domain/schedules/ScheduleReader.java b/domain/src/main/java/com/imlinker/domain/schedules/ScheduleReader.java
@@ -8,7 +8,6 @@
 import com.imlinker.domain.schedules.model.query.SearchUserNearTermScheduleQueryCondition;
 import com.imlinker.domain.user.model.User;
 import com.imlinker.domain.schedules.model.query.SearchDateRangeScheduleQueryCondition;
-import com.imlinker.domain.schedules.model.query.SearchNearTermScheduleQueryCondition;
 import com.imlinker.error.ApplicationException;
 import com.imlinker.error.ErrorType;
 import java.time.LocalDateTime;

diff --git a/domain/src/main/java/com/imlinker/domain/schedules/model/ScheduleRepository.java b/domain/src/main/java/com/imlinker/domain/schedules/model/ScheduleRepository.java
@@ -4,7 +4,6 @@
 import com.imlinker.domain.schedules.model.query.SearchContactNearTermScheduleQueryCondition;
 import com.imlinker.domain.schedules.model.query.SearchUserNearTermScheduleQueryCondition;
 import com.imlinker.domain.schedules.model.query.SearchDateRangeScheduleQueryCondition;
-import com.imlinker.domain.schedules.model.query.SearchNearTermScheduleQueryCondition;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;

diff --git a/storage/src/main/java/com/imlinker/storage/schedules/ScheduleAdaptor.java b/storage/src/main/java/com/imlinker/storage/schedules/ScheduleAdaptor.java
@@ -6,7 +6,6 @@
 import com.imlinker.domain.schedules.model.query.SearchContactNearTermScheduleQueryCondition;
 import com.imlinker.domain.schedules.model.query.SearchUserNearTermScheduleQueryCondition;
 import com.imlinker.domain.schedules.model.query.SearchDateRangeScheduleQueryCondition;
-import com.imlinker.domain.schedules.model.query.SearchNearTermScheduleQueryCondition;
 import com.imlinker.storage.schedules.mapper.ScheduleMapper;
 import java.time.LocalDateTime;
 import java.util.List;

diff --git a/storage/src/main/java/com/imlinker/storage/schedules/ScheduleJdbcQueryRepository.java b/storage/src/main/java/com/imlinker/storage/schedules/ScheduleJdbcQueryRepository.java
@@ -4,7 +4,6 @@
 import com.imlinker.domain.schedules.model.query.SearchContactNearTermScheduleQueryCondition;
 import com.imlinker.domain.schedules.model.query.SearchUserNearTermScheduleQueryCondition;
 import com.imlinker.domain.schedules.model.query.SearchDateRangeScheduleQueryCondition;
-import com.imlinker.domain.schedules.model.query.SearchNearTermScheduleQueryCondition;
 import lombok.RequiredArgsConstructor;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;