From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 21 Mar 2018 17:22:17 +0000 (+0000)
Subject: JAL-2754 reinstate PA import from bad conflict merge
X-Git-Tag: Release_2_11_0~45
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a6290d3f52e62863d93ca5b5c5b0739fc6143d4c;p=jalview.git

JAL-2754 reinstate PA import from bad conflict merge
---

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index 51fa5ce..05b9aea 100644
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -9,6 +9,8 @@ import jalview.io.FileLoader;
 import java.awt.Font;
 import java.awt.FontMetrics;
 
+import junit.extensions.PA;
+
 import org.testng.annotations.Test;
 
 public class SeqCanvasTest