From 039e61def6780744dc557b2986a0787aac235cfe Mon Sep 17 00:00:00 2001
From: Michael Rausch <mra106@uclive.ac.nz>
Date: Wed, 22 Mar 2017 14:50:28 +1300
Subject: [PATCH] Fixed broken JavaFX file #fix

---
 src/main/resources/RaceView.fxml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/resources/RaceView.fxml b/src/main/resources/RaceView.fxml
index 46120626..d14c7c88 100644
--- a/src/main/resources/RaceView.fxml
+++ b/src/main/resources/RaceView.fxml
@@ -7,9 +7,6 @@
 <?import javafx.scene.canvas.Canvas?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<<<<<<< HEAD
-<AnchorPane fx:id="contentAnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.CanvasController">
-=======
 <GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.controllers.CanvasController">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" maxWidth="220.0" minWidth="220.0" prefWidth="273.0" />
@@ -20,7 +17,6 @@
     <RowConstraints minHeight="10.0" prefHeight="320.0" vgrow="SOMETIMES" />
     <RowConstraints minHeight="10.0" prefHeight="320.0" vgrow="SOMETIMES" />
   </rowConstraints>
->>>>>>> 29a0b236703d61e4553cda97e470d1125587cfde
    <children>
       <AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="960.0" prefWidth="1280.0" style="-fx-background-color: lightblue;" GridPane.columnIndex="1" GridPane.rowSpan="3">
          <children>