Skip to content
Commit 414e87d1 authored by mvalko's avatar mvalko
Browse files

Merge remote-tracking branch 'origin/main' 

# 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
parents 8afc5ef8 9aea148b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment