From: James Procter <j.procter@dundee.ac.uk>
Date: Fri, 26 May 2023 11:57:41 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups
X-Git-Tag: Release_2_11_3_0~14^2~3^2^2~9
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e67a74ee1dac618d941fce0fc5ef4561f76380b1;p=jalview.git

Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups

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

e67a74ee1dac618d941fce0fc5ef4561f76380b1
diff --cc src/jalview/gui/AnnotationLabels.java
index 8930629,487c18b..4148998
--- a/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@@ -68,9 -62,7 +64,6 @@@ import jalview.io.FormatAdapter
  import jalview.util.Comparison;
  import jalview.util.MessageManager;
  import jalview.util.Platform;
--import jalview.ws.datamodel.alphafold.PAEContactMatrix;
  
  /**
   * The panel that holds the labels for alignment annotations, providing