From 7b47d72ef071a4a4a9310d7466b9d4c8a4984f28 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Wed, 26 Jul 2017 16:22:01 +1200
Subject: [PATCH] Merge branch 'develop' of
 /home/cosc/student/ajm412/Documents/SENG302/team-13 with conflicts.

---
 src/test/java/seng302/models/YachtTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/seng302/models/YachtTest.java b/src/test/java/seng302/models/YachtTest.java
index ab467522..b2e3ca8f 100644
--- a/src/test/java/seng302/models/YachtTest.java
+++ b/src/test/java/seng302/models/YachtTest.java
@@ -24,4 +24,5 @@ public class YachtTest {
         yachts.add(new Yacht("Yacht 3", "Y3", new GeoPoint(-35.0, -15.5), 20.0));
     }
 
+
 }