Merge remote-tracking branch 'origin/samu_masken'

# Conflicts: # src/main/java/Logik/Mahlzeit.java
2024-01-26 08:08:41 +01:00
parent 58ab3e313c bc4926aca8
commit 349a8f02cc
5 changed files with 131 additions and 52 deletions
--- a/src/main/resources/de/subway_surfers/vpr_app/essensverwaltung_mitarbeiter-view.fxml
+++ b/src/main/resources/de/subway_surfers/vpr_app/essensverwaltung_mitarbeiter-view.fxml
@@ -52,9 +52,6 @@
    </center>
    <bottom>
        <BorderPane styleClass="button-untenrechts">
-            <right>
-                <Button text="Bestätigen" defaultButton="true" styleClass=".button"/>
-            </right>
        </BorderPane>
    </bottom>
 </BorderPane>