jhj

src/fußballmanager/Team.java

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