Skip to content
Find file Blame History Permalink
  • mvalko's avatar
    Merge remote-tracking branch 'origin/main' · 414e87d1
    mvalko authored 
    # Conflicts:
#	src/main/java/cz/fi/muni/pa165/entity/PlayerEntity.java
#	src/main/java/cz/fi/muni/pa165/entity/TeamEntity.java
#	src/main/java/cz/fi/muni/pa165/entity/TeamManagerEntity.java
    414e87d1