alt

Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java

@@ -94,7 +94,14 @@ public class HappyBirdMain extends Application {
         labelsFormating(labels, pane);
         headlineFormating(headlineLabels, pane);
 
+<<<<<<< HEAD
         /**alle labels an ihre Stelle:*/
+=======
+        /*Überschrift umbenennen, falls aus anderem Screen*/
+        headline.setText("HAPPY BIRD");
+
+        /*alle labels an ihre Stelle:*/
+>>>>>>> edf4ca25952f2176808ce31dafa9d52f1c7c0cd6
         int yPositionLabels = 225;
         for (Label label : labels) {
             label.setLayoutX(275);