Skip to content
Snippets Groups Projects
Commit 718a2b16 authored by Herman Andersen Dyrkorn's avatar Herman Andersen Dyrkorn
Browse files

merge error fix

parent d7ed8301
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
src/sample/sample.fxml
+ 1
− 0
View file @ 718a2b16
......@@ -16,6 +16,7 @@
<Font size="17.0" />
</font></Text>
<Button layoutX="531.0" layoutY="10.0" mnemonicParsing="false" onAction="#handleHurlAll" text="Hurl all your thoughts" />
<ListView fx:id="listView" layoutX="40.0" layoutY="52.0" prefHeight="236.0" prefWidth="585.0" style="-fx-border-color: #ce94a2; -fx-background-color: #f3f4f5; -fx-border-width: 1px;" />
<Button layoutX="365.0" layoutY="10.0" mnemonicParsing="false" onAction="#handleHurlSelected" text="Hurl selected thoughts" />
</children>
</AnchorPane>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment