From c11d0703d76c91b2173b6d64e4252ca5fdf21ef1 Mon Sep 17 00:00:00 2001
From: Peter Jakubco <pjakubco@gmail.com>
Date: Sun, 26 Mar 2023 17:43:24 +0200
Subject: [PATCH] [#314] fixed some merge problems

---
 .../emustudio/plugins/device/mits88sio/ControlChannel.java | 5 -----
 .../emustudio/plugins/device/mits88sio/DataChannel.java    | 7 +------
 .../emustudio/plugins/memory/bytemem/gui/MemoryGui.java    | 6 ------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java
index 9671bf203..9656cf997 100644
--- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java
+++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/ControlChannel.java
@@ -44,11 +44,6 @@ public String getName() {
         return toString();
     }
 
-    @Override
-    public String toString() {
-        return "MITS 88-SIO control channel";
-    }
-
     @Override
     public String toString() {
         return "88-SIO Control Channel";
diff --git a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java
index 5757c6b8f..f13e5d65d 100644
--- a/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java
+++ b/plugins/device/88-sio/src/main/java/net/emustudio/plugins/device/mits88sio/DataChannel.java
@@ -53,11 +53,6 @@ public String getName() {
         return toString();
     }
 
-    @Override
-    public String toString() {
-        return "MITS 88-SIO data channel";
-    }
-
     private byte mapCharacter(byte data) {
         if (data == DELETE_CHAR) {
             data = settings.getMapDeleteChar() == SioUnitSettings.MAP_CHAR.BACKSPACE ? BACKSPACE_CHAR : DELETE_CHAR;
@@ -70,6 +65,6 @@ private byte mapCharacter(byte data) {
 
     @Override
     public String toString() {
-        return "88 SIO Data Channel";
+        return "88-SIO Data Channel";
     }
 }
diff --git a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java
index 4ec6e85f6..3d7934689 100644
--- a/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java
+++ b/plugins/memory/byte-mem/src/main/java/net/emustudio/plugins/memory/bytemem/gui/MemoryGui.java
@@ -61,12 +61,6 @@ public class MemoryGui extends JDialog {
     private final EraseMemoryAction eraseMemoryAction;
     private final SettingsAction settingsAction;
 
-    private final LoadImageAction loadImageAction;
-    private final DumpMemoryAction dumpMemoryAction;
-    private final GotoAddressAction gotoAddressAction;
-    private final FindSequenceAction findSequenceAction;
-
-
     public MemoryGui(JFrame parent, MemoryImpl memory, MemoryContextImpl context, PluginSettings settings, Dialogs dialogs) {
         super(parent);