Merge branch 'format-and-doc'

This commit is contained in:
Michael Rausch
2017-03-08 22:57:59 +13:00
17 changed files with 775 additions and 706 deletions
+2 -2
View File
@@ -3,8 +3,8 @@ package seng302;
import java.util.ArrayList;
class Marker{
private String name;
private ArrayList<Boat> boatOrder;
private String name;
private ArrayList<Boat> boatOrder;
/**
* Represents the marker at the beginning of a leg