From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 8 Dec 2016 09:54:47 +0000 (+0000)
Subject: Merge branch 'bug/JAL-2358phantomChimera' into spikes/mungo
X-Git-Tag: Release_2_11_0~62^2~33
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fd9e6f7e0424bb69e46443d7d96237d99e792c03;p=jalview.git

Merge branch 'bug/JAL-2358phantomChimera' into spikes/mungo

Conflicts:
	src/jalview/gui/ChimeraViewFrame.java
---

fd9e6f7e0424bb69e46443d7d96237d99e792c03
diff --cc src/jalview/gui/ChimeraViewFrame.java
index 4c38898,7cf3bfc..bc247ca
--- a/src/jalview/gui/ChimeraViewFrame.java
+++ b/src/jalview/gui/ChimeraViewFrame.java
@@@ -71,8 -66,6 +71,7 @@@ import javax.swing.JCheckBoxMenuItem
  import javax.swing.JColorChooser;
  import javax.swing.JInternalFrame;
  import javax.swing.JMenu;
 +import javax.swing.JMenuItem;
- import javax.swing.JOptionPane;
  import javax.swing.event.InternalFrameAdapter;
  import javax.swing.event.InternalFrameEvent;
  import javax.swing.event.MenuEvent;