From ea46ec38cd24db455138fa5ba847bddfdb071d8c Mon Sep 17 00:00:00 2001
From: Eugene Livis <elivis@basistech.com>
Date: Wed, 7 Sep 2016 14:27:23 -0400
Subject: [PATCH] Fixed merge conflict

---
 Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
index b1f62f546e..3d9cc8b189 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
@@ -54,9 +54,6 @@ final class LocalDiskPanel extends JPanel {
     private static final Logger logger = Logger.getLogger(LocalDiskPanel.class.getName());
     private static LocalDiskPanel instance;
     private static final long serialVersionUID = 1L;
-
-    private PropertyChangeSupport pcs = null;
-
     private List<LocalDisk> disks;
     private LocalDiskModel model;
     private boolean enableNext = false;