Auslagerung der Methoden zum Formatieren

2021-11-29 13:19:52 +01:00
parent e25465873b
commit 5378876ff9
13 changed files with 266 additions and 178 deletions
--- a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class
+++ b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class
--- a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar
+++ b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar
--- a/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml
+++ b/Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml
@@ -7,10 +7,13 @@

 <StackPane prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird" back >

+<<<<<<< HEAD
+=======
    <ImageView>
        <image>
            <Image url="@pics/Background.png"></Image>
        </image>
    </ImageView>

+>>>>>>> 5db5b6bb195a2b7d1296e7d3f9b98d6c75dba2c2
 </StackPane>
--- a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin
+++ b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin