From 6a74b5fe3656651495bef7ec3a41ef9913b400b8 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Tue, 23 May 2017 13:19:48 +1200
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/sprint4_master'
 into story36

# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]
---
 mock/src/main/java/seng302/Model/Race.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mock/src/main/java/seng302/Model/Race.java b/mock/src/main/java/seng302/Model/Race.java
index a5de88c9..c894b21f 100644
--- a/mock/src/main/java/seng302/Model/Race.java
+++ b/mock/src/main/java/seng302/Model/Race.java
@@ -3,7 +3,6 @@ package seng302.Model;
 import javafx.animation.AnimationTimer;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import seng302.Constants;
 import seng302.DataInput.RaceDataSource;
 import seng302.MockOutput;
@@ -14,8 +13,6 @@ import seng302.Networking.Messages.Enums.RaceStatusEnum;
 import seng302.Networking.Messages.Enums.RaceTypeEnum;
 import seng302.Networking.Messages.RaceStatus;
 
-
-import java.io.*;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;