From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 7 Jun 2019 15:22:03 +0000 (+0100)
Subject: Merge branch 'develop' into feature/JAL-3187linkedFeatures
X-Git-Tag: Release_2_11_1_0~52
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=b2eb64f196223039a95348a4026f0453693ee0e7

Merge branch 'develop' into feature/JAL-3187linkedFeatures
---

b2eb64f196223039a95348a4026f0453693ee0e7
diff --cc test/jalview/project/Jalview2xmlTests.java
index f5044bb,5f1256c..521ef81
--- a/test/jalview/project/Jalview2xmlTests.java
+++ b/test/jalview/project/Jalview2xmlTests.java
@@@ -67,9 -71,9 +70,10 @@@ import jalview.schemes.RNAHelicesColour
  import jalview.schemes.StrandColourScheme;
  import jalview.schemes.TCoffeeColourScheme;
  import jalview.structure.StructureImportSettings;
+ import jalview.util.MapList;
  import jalview.util.matcher.Condition;
  import jalview.viewmodel.AlignmentViewport;
 +import jalview.viewmodel.seqfeatures.FeatureRendererModel;
  
  import java.awt.Color;
  import java.io.File;