Fixed merge conflict

This commit is contained in:
Eugene Livis 2016-09-07 14:27:23 -04:00
parent 8f879fb685
commit ea46ec38cd

View File

@ -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;