Fix conflict

axonivy-market · Jul 29, 2024 · 9445b8e · 9445b8e
1 parent 430baf1
commit 9445b8e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/marketplace-service/src/main/java/com/axonivy/market/controller/AppController.java b/marketplace-service/src/main/java/com/axonivy/market/controller/AppController.java
@@ -1,17 +1,19 @@
 package com.axonivy.market.controller;
 
-import com.axonivy.market.enums.ErrorCode;
-import com.axonivy.market.model.Message;
-import lombok.extern.log4j.Log4j2;
+import static com.axonivy.market.constants.RequestMappingConstants.ROOT;
+import static com.axonivy.market.constants.RequestMappingConstants.SWAGGER_URL;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import static com.axonivy.market.constants.RequestMappingConstants.ROOT;
-import static com.axonivy.market.constants.RequestMappingConstants.SWAGGER_URL;
+import com.axonivy.market.enums.ErrorCode;
+import com.axonivy.market.model.Message;
+
+import lombok.extern.log4j.Log4j2;
 
 @Log4j2
 @RestController