From 1d8ba75382faccafbbd8fae63a7732988b5b7bd9 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Fri, 24 Mar 2023 12:00:20 +0100
Subject: [PATCH] Fix merge conflict

---
 swing/src/net/sf/openrocket/gui/main/BasicFrame.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index 22fbc7964..dd3417dbf 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -565,13 +565,13 @@ public class BasicFrame extends JFrame {
 		fileMenu.addSeparator();
 
 		JMenu subMenu = new JMenu(trans.get("RocketActions.Select"));
-		menu.add(subMenu);
+		fileMenu.add(subMenu);
 		item = new JMenuItem(actions.getSelectSameColorAction());
 		subMenu.add(item);
 		item = new JMenuItem(actions.getDeselectAllAction());
 		subMenu.add(item);
 
-		menu.addSeparator();
+		fileMenu.addSeparator();
 
 		item = new JMenuItem(actions.getScaleAction());
 		fileMenu.add(item);