From 2b20f17693264f0959be41b3da90d03dcb0124ca Mon Sep 17 00:00:00 2001 From: Ladislav Sulak Date: Thu, 3 Oct 2024 15:16:05 +0200 Subject: [PATCH] #280: post-merge conflict resolutions --- .../api/http/GetFlowCheckpointsV2EndpointUnitTests.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/test/scala/za/co/absa/atum/server/api/http/GetFlowCheckpointsV2EndpointUnitTests.scala b/server/src/test/scala/za/co/absa/atum/server/api/http/GetFlowCheckpointsV2EndpointUnitTests.scala index 7d33bdf3..3bc315f0 100644 --- a/server/src/test/scala/za/co/absa/atum/server/api/http/GetFlowCheckpointsV2EndpointUnitTests.scala +++ b/server/src/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