From bf33ec61c7753e6ac7404155a2f14ba3f895832a Mon Sep 17 00:00:00 2001
From: Liam Beckett <lsb35@uclive.ac.nz>
Date: Sat, 17 Sep 2016 18:14:17 +1200
Subject: [PATCH] Merge fix

---
 .../seng202/group9/GUI/FlightSummaryController.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng202/group9/GUI/FlightSummaryController.java b/src/main/java/seng202/group9/GUI/FlightSummaryController.java
index 2b19578..134b220 100644
--- a/src/main/java/seng202/group9/GUI/FlightSummaryController.java
+++ b/src/main/java/seng202/group9/GUI/FlightSummaryController.java
@@ -31,15 +31,17 @@ public class FlightSummaryController extends Controller {
 
     private Dataset theDataSet = null;
 
+
+    private int currentPathId = 0;
+    private int currentPathIndex = 0;
+
+
+
     @FXML
     private Button flightRawData;
     private Map map;
     @FXML
     private WebView mapView;
-    private int currentPathId = 0;
-    private int currentPathIndex = 0;
-
-
     @FXML
     ListView<String> flightPathListView;
     final ObservableList<String> flightList = FXCollections.observableArrayList();