You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

fjc40 1bd9fdd931 Merge remote-tracking branch 'origin/sprint4_master' into story36_boundary_fix_attempt_2 ... # Conflicts: # mock/src/main/java/seng302/Model/Race.java Resolved. Also reverted the change to the prestart and preparatory time, as they had gotten flipped around (prestart is > 3min to start, preparatory is < 1 min to start).		9 years ago
..
java/seng302	Merge remote-tracking branch 'origin/sprint4_master' into story36_boundary_fix_attempt_2	9 years ago
resources	Merge commit '7990ac9d2ee8c71d50606813e21a0674f442464f' into story31.2_alternateTack.	9 years ago