diff --git a/Happy_Bird/.gradle/checksums/md5-checksums.bin b/Happy_Bird/.gradle/checksums/md5-checksums.bin index 4f2a956..6251ac9 100644 Binary files a/Happy_Bird/.gradle/checksums/md5-checksums.bin and b/Happy_Bird/.gradle/checksums/md5-checksums.bin differ diff --git a/Happy_Bird/.gradle/checksums/sha1-checksums.bin b/Happy_Bird/.gradle/checksums/sha1-checksums.bin index 4bf74b2..491167f 100644 Binary files a/Happy_Bird/.gradle/checksums/sha1-checksums.bin and b/Happy_Bird/.gradle/checksums/sha1-checksums.bin differ diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java index 65ce4c7..33d9d17 100644 --- a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java +++ b/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);