Skip to content
Commit 8915e056 authored by Diana Gulčíková's avatar Diana Gulčíková
Browse files

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
parents 230f9afc e89e2fe4
Pipeline #207181 failed with stages
in 36 seconds
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