git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8fcaf3 5596834)
Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups
authorJames Procter <j.procter@dundee.ac.uk>
Fri, 26 May 2023 11:57:41 +0000 (12:57 +0100)
committerJames Procter <j.procter@dundee.ac.uk>
Fri, 26 May 2023 11:57:41 +0000 (12:57 +0100)
 Conflicts:
src/jalview/gui/AnnotationLabels.java

1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignViewport.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AnnotationLabels.java patch | diff1 | diff2 | blob | history
src/jalview/gui/StructureChooser.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignViewport.java
Simple merge
diff --cc src/jalview/gui/AnnotationLabels.java
index 8930629,487c18b..4148998
--- 1/src/jalview/gui/AnnotationLabels.java
--- 2/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
diff --cc src/jalview/gui/StructureChooser.java
Simple merge