Merged master.

This commit is contained in:
Joseph Gardner
2017-08-17 16:08:23 +12:00
parent d41e52766b
commit e26fb73627
@@ -9,10 +9,7 @@ import shared.enums.RoundingType;
import shared.enums.XMLFileType; import shared.enums.XMLFileType;
import shared.exceptions.InvalidRaceDataException; import shared.exceptions.InvalidRaceDataException;
import shared.exceptions.XMLReaderException; import shared.exceptions.XMLReaderException;
import shared.model.CompoundMark; import shared.model.*;
import shared.model.GPSCoordinate;
import shared.model.Leg;
import shared.model.Mark;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;