bugfixes + keyb. shortcuts

ejvindh · Oct 29, 2014 · 3be3f71 · 3be3f71
1 parent 9a3afb5
commit 3be3f71
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/bin/first/Gui.class b/bin/first/Gui.class
diff --git a/src/first/Gui.java b/src/first/Gui.java
@@ -292,8 +292,6 @@ public void initialize(URL url, ResourceBundle rb) {
 			menubar.setDisable(true);
 			System.out.println("No dictionaries found!");
 		}
-
-<<<<<<< HEAD
 		Platform.runLater(() -> {
 			fromDanishButton.getScene().getAccelerators().put(
                     new KeyCodeCombination(KeyCode.F, KeyCombination.SHORTCUT_DOWN),
@@ -321,8 +319,6 @@ public void initialize(URL url, ResourceBundle rb) {
         lang.setTooltip(new Tooltip("<ctrl/cmd d>"));
         searchtxt.setTooltip(new Tooltip("<ctrl/cmd l>"));
 
-=======
->>>>>>> a07388813fc646b77195251e38855273ee66cb5d
 		Runtime.getRuntime().addShutdownHook(new Thread(() -> {
 			//Slutter
 			if (settings.size() > 0) write_xml(settings, datadir+settingsFileName);