From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 16 Jan 2019 11:50:22 +0000 (+0000)
Subject: Merge branch 'feature/JAL-3063jaxbNoCastor' into develop
X-Git-Tag: Release_2_11_0~17^2~97^2~29^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1d6ce1bd2d0cf108d6207694e4aa6b845de11049;p=jalview.git

Merge branch 'feature/JAL-3063jaxbNoCastor' into develop
JAL-3063 todo: add castor-1.1-cycle.jar back to libraries inorder to ensure VAMSAS functionality remains
---

1d6ce1bd2d0cf108d6207694e4aa6b845de11049
diff --cc src/jalview/project/Jalview2XML.java
index 74b6bf0,b153d9f..4a4c0c2
--- a/src/jalview/project/Jalview2XML.java
+++ b/src/jalview/project/Jalview2XML.java
@@@ -59,10 -49,8 +59,9 @@@ import jalview.gui.AppVarna
  import jalview.gui.ChimeraViewFrame;
  import jalview.gui.Desktop;
  import jalview.gui.FeatureRenderer;
- import jalview.gui.Jalview2XML_V1;
  import jalview.gui.JvOptionPane;
  import jalview.gui.OOMWarning;
 +import jalview.gui.PCAPanel;
  import jalview.gui.PaintRefresher;
  import jalview.gui.SplitFrame;
  import jalview.gui.StructureViewer;