merge conflicts

ls1intum · Nov 30, 2024 · 7276a06 · 7276a06
1 parent 37e58a6
commit 7276a06
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java b/...java/de/tum/cit/aet/artemis/programming/service/localci/LocalCIQueueWebsocketService.java
@@ -174,7 +174,7 @@ private static List<BuildJobQueueItem> removeUnnecessaryInformation(List<BuildJo
     private static BuildConfig removeUnnecessaryInformationFromBuildConfig(BuildConfig buildConfig) {
         // We pass "" instead of null strings to avoid errors when serializing to JSON
         return new BuildConfig("", "", buildConfig.commitHashToBuild(), "", "", "", null, null, buildConfig.scaEnabled(), buildConfig.sequentialTestRunsEnabled(),
-                buildConfig.testwiseCoverageEnabled(), null, buildConfig.timeoutSeconds(), "", "", "");
+                buildConfig.testwiseCoverageEnabled(), null, buildConfig.timeoutSeconds(), "", "", "", null);
     }
 
     /**