MasterGordon
/
fussballmanager
mirror of https://github.com/MasterGordon/fussballmanager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jhj

This commit is contained in:
Delta1805 2017-09-20 18:59:47 +02:00
parent 5c81bc6001 d6acf05b72
commit b82738b505
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fußballmanager/Team.java
View File

@ -9,16 +9,16 @@ public class Team {
Torwart torwart; Torwart torwart;
int siege; int siege;
<<<<<<< HEAD
public Team(){ public Team(){
=======
public boolean isInTeam(Person p){ public boolean isInTeam(Person p){
for(Person pp:spieler){ for(Person pp:spieler){
if(p.equals(pp)) return true; if(p.equals(pp)) return true;
} }
if(torwart.equals(p)) return true; if(torwart.equals(p)) return true;
return false; return false;
>>>>>>> d6acf05b72f53607f222d077c1491dd1bb71add5
} }
} }