Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch

# Conflicts: # src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml
2023-01-31 12:27:59 +01:00
parent 1a9f13581e 6747188668
commit 2814244d29
3 changed files with 27 additions and 15 deletions
--- a/src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java
@@ -0,0 +1,4 @@
+package com.bib.essensbestellungsverwaltung;
+
+public class SettingsController {
+}