Konflikte lösen

2021-11-17 09:27:10 +01:00 · 2021-11-17 09:27:10 +01:00 · 8c31edf7e1
commit 8c31edf7e1
parent 8aabc3f235
9 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,5 @@
 # Default ignored files
 /shelf/
 /workspace.xml
-/.gradle
+Happy_Bird/.gradle
 /build
--- a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin
+++ b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin
--- a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock
+++ b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock
--- a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin
+++ b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin
--- a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock
+++ b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock
--- a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/Happy_Bird/.idea/.name
+++ b/Happy_Bird/.idea/.name
@ -1 +1 @@
-HappyBirdMain.java
+HappyBird.java
--- 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/tmp/compileJava/previous-compilation-data.bin
+++ b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin