michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken JavaFX file #fix

Browse Source
This commit is contained in:
Michael Rausch
2017-03-22 14:50:28 +13:00
parent f46a98fad9
commit 039e61def6
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/RaceView.fxml
-4
View File
@@ -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>