From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 21 Mar 2018 17:15:42 +0000 (+0000)
Subject: Merge branch 'releases/Release_2_10_4_Branch' into develop
X-Git-Tag: Release_2_11_0~47
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=bb7a2cab0b0daf1943760e95d64204a92d29e41a;p=jalview.git

Merge branch 'releases/Release_2_10_4_Branch' into develop
---

bb7a2cab0b0daf1943760e95d64204a92d29e41a
diff --cc src/jalview/gui/AquaInternalFrameManager.java
index 829135b,956c119..537ec17
--- a/src/jalview/gui/AquaInternalFrameManager.java
+++ b/src/jalview/gui/AquaInternalFrameManager.java
@@@ -253,4 -254,4 +254,4 @@@ public class AquaInternalFrameManager e
    {
      switchFrame(false);
    }
--}
++}
diff --cc test/jalview/gui/SeqCanvasTest.java
index 05b9aea,fb48fdb..51fa5ce
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@@ -9,10 -9,10 +9,8 @@@ import jalview.io.FileLoader
  import java.awt.Font;
  import java.awt.FontMetrics;
  
- import junit.extensions.PA;
- 
  import org.testng.annotations.Test;
  
 -import junit.extensions.PA;
 -
  public class SeqCanvasTest
  {
    /**