Merge branch 'develop' of /home/cosc/student/ajm412/Documents/SENG302/team-13 with conflicts.

This commit is contained in:
Alistair McIntyre
2017-07-26 16:22:01 +12:00
parent 5e6b402bf5
commit 7b47d72ef0
@@ -24,4 +24,5 @@ public class YachtTest {
yachts.add(new Yacht("Yacht 3", "Y3", new GeoPoint(-35.0, -15.5), 20.0)); yachts.add(new Yacht("Yacht 3", "Y3", new GeoPoint(-35.0, -15.5), 20.0));
} }
} }