From 3e5b793cb2e62f0ff386b1c2370fcb10f8840f8e Mon Sep 17 00:00:00 2001
From: Liam Beckett <lsb35@uclive.ac.nz>
Date: Tue, 13 Sep 2016 16:39:22 +1200
Subject: [PATCH] Trying to fix the merge conflict

---
 src/main/java/seng202/group9/Controller/Dataset.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/seng202/group9/Controller/Dataset.java b/src/main/java/seng202/group9/Controller/Dataset.java
index 3e93c9b..19c4056 100644
--- a/src/main/java/seng202/group9/Controller/Dataset.java
+++ b/src/main/java/seng202/group9/Controller/Dataset.java
@@ -707,7 +707,7 @@ public class Dataset {
     }
     /*
 
-    
+
      */
     /**
      * This function updates the connections between airports citys countries etc.