Merge branch 'wake_remake' of /home/cosc/student/wmu16/Documents/300/SENG302/team-13 with conflicts.

2026-05-09 06:18:44 +00:00 · 2017-05-01 22:00:12 +12:00
parent 3adadcc1e1
commit 944755fde1
2 changed files with 6 additions and 6 deletions
@@ -152,7 +152,7 @@ public class Race {

    /**
     * Set a boat as finished
-     * @param boat The boat that has finished the race
+     * @param boat The boat that has finished the race/home/cosc/student/wmu16
     */
    public void setBoatFinished(Boat boat){
        this.finishingOrder.add(boat);