From b7677073e7124b615e679dd712884cc8a39d7c78 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Fri, 12 Aug 2022 21:14:44 +0200
Subject: [PATCH] Fix merge conflict

---
 swing/src/net/sf/openrocket/gui/main/SimulationPanel.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
index 6d9ed2f48..d287d26fa 100644
--- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -1029,6 +1029,7 @@ public class SimulationPanel extends JPanel {
 				simulationTable.addRowSelectionInterval(row, row);
 			}
 		}
+	}
 
 	private static class NextRowAction extends AbstractAction {
 		private final JTable table;