From fa80baf0fb810bd2ee53d24d6f7a7b7e552caf00 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Thu, 9 May 2019 10:24:34 -0400
Subject: [PATCH] GT-2763 - Table Sorting - fix merge error

---
 .../main/java/docking/widgets/dialogs/SettingsDialog.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/SettingsDialog.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/SettingsDialog.java
index fe214b182b..3ccc06e013 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/SettingsDialog.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/dialogs/SettingsDialog.java
@@ -27,11 +27,10 @@ import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellEditor;
 
 import docking.DialogComponentProvider;
-import docking.DockingWindowManager;<<<<<<<Upstream,based on origin/master
+import docking.DockingWindowManager;
 import docking.widgets.checkbox.GCheckBox;
 import docking.widgets.combobox.GComboBox;
-import docking.widgets.table.DefaultSortedTableModel;=======
-import docking.widgets.table.AbstractSortedTableModel;>>>>>>>000543e  GT-2763-Table Sorting-updated help;removed old DefaultSortedTableModel
+import docking.widgets.table.AbstractSortedTableModel;
 import docking.widgets.table.GTable;
 import ghidra.docking.settings.*;
 import ghidra.util.HelpLocation;