2210880
/
Hennen-und-Fuechse
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge-Fehler behoben

pull/5/head
robinschumann 2022-11-28 18:27:32 +01:00
parent 9725f74097
commit 26d50d9c12
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.project
View File

@ -16,11 +16,7 @@
</natures> </natures>
<filteredResources> <filteredResources>
<filter> <filter>
<<<<<<< HEAD
<id>1669476271551</id> <id>1669476271551</id>
=======
<id>1669479668624</id>
>>>>>>> 3ce9c552765558c513783ea39e3fb8769742fd55
<name></name> <name></name>
<type>30</type> <type>30</type>
<matcher> <matcher>

8
src/domain/BotEasyFuchs.java
View File

@ -7,11 +7,11 @@ public class BotEasyFuchs extends Bot {
} }
@Override @Override
<<<<<<< HEAD
public String zugBestimmen() { public String zugBestimmen() {
=======
public String zugBestimmen() {
>>>>>>> 3ce9c552765558c513783ea39e3fb8769742fd55
return "Ich bins der Einfache Fuchs Bot"; return "Ich bins der Einfache Fuchs Bot";
} }