#280: post-merge conflict resolutions

AbsaOSS · Oct 3, 2024 · 522ad56 · 522ad56
1 parent 7d856d3
commit 522ad56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/server/src/main/scala/za/co/absa/atum/server/api/controller/FlowController.scala b/server/src/main/scala/za/co/absa/atum/server/api/controller/FlowController.scala
@@ -17,8 +17,8 @@
 package za.co.absa.atum.server.api.controller
 
 import za.co.absa.atum.model.dto.CheckpointV2DTO
-import za.co.absa.atum.server.model.envelopes.ErrorResponse
-import za.co.absa.atum.server.model.envelopes.SuccessResponse.PaginatedResponse
+import za.co.absa.atum.model.envelopes.ErrorResponse
+import za.co.absa.atum.model.envelopes.SuccessResponse.PaginatedResponse
 import zio.IO
 import zio.macros.accessible
 

diff --git a/server/src/main/scala/za/co/absa/atum/server/api/controller/FlowControllerImpl.scala b/server/src/main/scala/za/co/absa/atum/server/api/controller/FlowControllerImpl.scala
@@ -17,9 +17,10 @@
 package za.co.absa.atum.server.api.controller
 
 import za.co.absa.atum.model.dto.CheckpointV2DTO
+import za.co.absa.atum.model.envelopes.ErrorResponse
+import za.co.absa.atum.model.envelopes.SuccessResponse.PaginatedResponse
 import za.co.absa.atum.server.api.service.FlowService
-import za.co.absa.atum.server.model.envelopes.{ErrorResponse, PaginatedResult}
-import za.co.absa.atum.server.model.envelopes.SuccessResponse.PaginatedResponse
+import za.co.absa.atum.server.model.PaginatedResult
 import zio._
 
 class FlowControllerImpl(flowService: FlowService) extends FlowController with BaseController {