Merge branch 'milestone_2' into 13_fixes_by_diana
# Conflicts: # car/src/main/java/cz/muni/pa165/car/data/repository/CarRepository.java # car/src/main/java/cz/muni/pa165/car/service/DriverManagerService.java # common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/Car.java # common_library/src/main/java/cz/muni/pa165/common_library/racecomponents/Driver.java # driver/src/main/java/cz/muni/pa165/driver/service/DriverInitService.java
Please register or sign in to comment