resolve merge conflicts

boal · boal · commit af3638f0f3c2 · 2025-12-04T10:03:51.000+01:00
diff --git a/src/main/java/de/muenchen/dave/scheduler/ZaehlungStatusUpdater.java b/src/main/java/de/muenchen/dave/scheduler/ZaehlungStatusUpdater.java
@@ -42,4 +42,4 @@ public void updateStatus() {
         log.info("Scheduler ZaehlungStatusUpdater end");
     }
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,4 @@ public void updateStatus() {`
`42`	`42`	`log.info("Scheduler ZaehlungStatusUpdater end");`
`43`	`43`	`}`
`44`	`44`
`45`		`-}`
	`45`	`+}`