mirror of
https://github.com/elisspace/autopsy.git
synced 2026-09-04 06:50:00 +00:00
Fixed merge conflict
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user