Merge branch 'master' of https://git.bib.de/PBS2H20AAL/HappyBird

Konflikte lösen
2021-11-17 09:28:22 +01:00 · 2021-11-17 09:27:10 +01:00
9 changed files with 2 additions and 2 deletions
@@ -1,5 +1,5 @@
 # Default ignored files
 /shelf/
 /workspace.xml
-/.gradle
+Happy_Bird/.gradle
 /build
@@ -1 +1 @@
-HappyBirdMain.java
+HappyBird.java
Author	SHA1	Message	Date
PBS2H20AAL	a043c824f1	Merge branch 'master' of https://git.bib.de/PBS2H20AAL/HappyBird	2021-11-17 09:28:22 +01:00
PBS2H20AAL	8c31edf7e1	Konflikte lösen	2021-11-17 09:27:10 +01:00