JAL-2754 reinstate PA import from bad conflict merge
authorJim Procter <jprocter@issues.jalview.org>
Wed, 21 Mar 2018 17:22:17 +0000 (17:22 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 21 Mar 2018 17:22:17 +0000 (17:22 +0000)
commita6290d3f52e62863d93ca5b5c5b0739fc6143d4c
tree80aadf0118acee06944360b66b0cd030f14cad16
parenta8b2027776e39d18756326dbf232e042cfe87798
JAL-2754 reinstate PA import from bad conflict merge
test/jalview/gui/SeqCanvasTest.java