alte Files

This commit is contained in:
Mats Pape 2021-11-25 13:20:21 +01:00
parent da0e493461
commit 7ad6f414df
10 changed files with 0 additions and 14 deletions

View File

@ -5,15 +5,8 @@
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<<<<<<< HEAD
<VBox 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">
<Button>
Start
</Button>
=======
<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 >
>>>>>>> c070a72d9131552445c751d71391bab4f0059fd4
<ImageView>
<image>
<Image url="@pics/Background.png"></Image>

View File

@ -5,15 +5,8 @@
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<<<<<<< HEAD
<VBox 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">
<Button>
Start
</Button>
=======
<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 >
>>>>>>> c070a72d9131552445c751d71391bab4f0059fd4
<ImageView>
<image>
<Image url="@pics/Background.png"></Image>