Fix merge conflicts

SolaceProducts · Dec 1, 2023 · 560f637 · 560f637
2 parents 59bbd61 + 9f100aa
commit 560f637
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/...aas/ep/event/management/agent/plugin/terraform/manager/TerraformLogProcessingService.java b/...aas/ep/event/management/agent/plugin/terraform/manager/TerraformLogProcessingService.java
@@ -73,7 +73,7 @@ public CommandResult buildTfCommandResult(List<String> jsonLogs) {
                 .toList();
 
         List<Map<String, Object>> errorLogs = getErrorLogs(jsonLogs);
-        
+
         JobStatus status = CollectionUtils.isEmpty(errorLogs) ? JobStatus.success : JobStatus.error;
         return CommandResult.builder()
                 .logs(ListUtils.union(successLogs, errorLogs))
@@ -133,7 +133,6 @@ KEY_DIAGNOSTIC_DETAIL, extractDiagnosticDetailMessage(expandedLogMessage.get(KEY
                 "level", expandedLogMessage.get(KEY_LEVEL).toString().toUpperCase(),
                 "timestamp", expandedLogMessage.get(KEY_TIMESTAMP)
         );
-
     }
 
     private String extractDiagnosticDetailMessage(Object diagnostic) {