From: James Procter <j.procter@dundee.ac.uk>
Date: Mon, 13 Feb 2023 17:28:45 +0000 (+0000)
Subject: Merge branch 'develop' into feature/JAL-1713_overviewInProject
X-Git-Tag: Release_2_11_3_0~18^2~17
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b303b657375dee5ac79e2f52ef96803652a2fbd1;p=jalview.git

Merge branch 'develop' into feature/JAL-1713_overviewInProject
---

b303b657375dee5ac79e2f52ef96803652a2fbd1
diff --cc test/jalview/project/Jalview2xmlTests.java
index 23a8be6,8886394..91ea959
--- a/test/jalview/project/Jalview2xmlTests.java
+++ b/test/jalview/project/Jalview2xmlTests.java
@@@ -50,9 -48,9 +50,10 @@@ import jalview.api.AlignViewportI
  import jalview.api.AlignmentViewPanel;
  import jalview.api.FeatureColourI;
  import jalview.api.ViewStyleI;
 +import jalview.bin.Cache;
  import jalview.datamodel.AlignmentAnnotation;
  import jalview.datamodel.AlignmentI;
+ import jalview.datamodel.Annotation;
  import jalview.datamodel.DBRefEntry;
  import jalview.datamodel.GeneLocus;
  import jalview.datamodel.HiddenSequences;