From b938237f0c219af47e65a30b169968df87bd2529 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Mon, 4 Jul 2022 23:31:31 +0200
Subject: [PATCH] Resolve merge conflict

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

diff --git a/swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java b/swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java
index f47c57b1e..55559d7b7 100644
--- a/swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java
+++ b/swing/src/net/sf/openrocket/gui/adaptors/PresetModel.java
@@ -9,6 +9,7 @@ import javax.swing.ComboBoxModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.sf.openrocket.gui.configdialog.RocketComponentConfig;
 import net.sf.openrocket.database.Database;
 import net.sf.openrocket.database.DatabaseListener;
 import net.sf.openrocket.document.OpenRocketDocument;