[prmr#538] Fix mnemonic for dark mode menu item.

jkcoding7 · May 7, 2024 · ced7c64 · ced7c64
1 parent ef54c52
commit ced7c64
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/org/jetuml/JetUML.properties b/src/org/jetuml/JetUML.properties
@@ -285,11 +285,7 @@ view.autoedit_node.text=Auto Edit Node
 view.autoedit_node.mnemonic=A
 view.autoedit_node.icon=16x16/document-edit.png
 view.dark_mode.text=Dark Mode
-<<<<<<< Upstream, based on origin/featureDarkMode
-view.dark_mode.mnemonic=M
-=======
 view.dark_mode.mnemonic=A
->>>>>>> 08de680 [#538] Add dark mode menu item and icon.
 view.dark_mode.icon=16x16/dark-mode.png
 view.diagram_size.text=Set Diagram Size
 view.diagram_size.mnemonic=D