Merge branch 'Competition+SportEvent' · jiritobias/SportEventManager@9c91f45 · GitHub

Commit

Merge branch 'Competition+SportEvent'

Browse files

# Conflicts:
#	persistence/persistence.iml
#	persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDaoImpl.java
#	persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java
#	persistence/src/main/java/cz/fi/muni/pa165/entity/Competition.java
#	persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java

Loading branch information

jiritobias committed Oct 29, 2017

2 parents 0679576 + 8293d8d commit 9c91f45