#280: post-merge conflict resolutions

AbsaOSS · Oct 3, 2024 · 2b20f17 · 2b20f17
1 parent 522ad56
commit 2b20f17
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...rc/test/scala/za/co/absa/atum/server/api/http/GetFlowCheckpointsV2EndpointUnitTests.scala b/...rc/test/scala/za/co/absa/atum/server/api/http/GetFlowCheckpointsV2EndpointUnitTests.scala
@@ -26,8 +26,8 @@ import sttp.tapir.ztapir.{RIOMonadError, RichZEndpoint}
 import za.co.absa.atum.model.dto.CheckpointV2DTO
 import za.co.absa.atum.server.api.TestData
 import za.co.absa.atum.server.api.controller.FlowController
-import za.co.absa.atum.server.model.{NotFoundErrorResponse, Pagination}
-import za.co.absa.atum.server.model.SuccessResponse.PaginatedResponse
+import za.co.absa.atum.model.envelopes.{NotFoundErrorResponse, Pagination}
+import za.co.absa.atum.model.envelopes.SuccessResponse.PaginatedResponse
 import zio.{Scope, ZIO, ZLayer}
 import zio.test.{Spec, TestEnvironment, ZIOSpecDefault, assertZIO}
 import zio.test.Assertion.equalTo