alte Files
This commit is contained in:
parent
da0e493461
commit
7ad6f414df
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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>
|
||||
|
Binary file not shown.
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user