mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 06:18:44 +00:00
Merge branch 'develop' of /home/cosc/student/ajm412/Documents/SENG302/team-13 with conflicts.
This commit is contained in:
@@ -24,4 +24,5 @@ public class YachtTest {
|
||||
yachts.add(new Yacht("Yacht 3", "Y3", new GeoPoint(-35.0, -15.5), 20.0));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user