Fix merge conflict

ls1intum · Feb 2, 2025 · ba61348 · ba61348
1 parent bbe3423
commit ba61348
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...ion-server/src/main/java/de/tum/cit/aet/helios/environment/EnvironmentLockHistoryDto.java b/...ion-server/src/main/java/de/tum/cit/aet/helios/environment/EnvironmentLockHistoryDto.java
@@ -23,6 +23,7 @@ public static EnvironmentLockHistoryDto fromEnvironmentLockHistory(
         environmentLockHistory.getUnlockedAt(),
         EnvironmentDto.fromEnvironment(
             environment,
-            environment.getLatestDeployment()));
+            environment.getLatestDeployment(),
+            environment.getLatestStatus()));
   }
 }