From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 28 Nov 2016 16:02:32 +0000 (+0000)
Subject: Merge branch 'features/JAL-2326_JOptionPane-refactoring' into develop
X-Git-Tag: Release_2_10_3b1~399^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=19424d4e1623bfcdcf30567f7a233fe81c4a9e4e;p=jalview.git

Merge branch 'features/JAL-2326_JOptionPane-refactoring' into develop
---

19424d4e1623bfcdcf30567f7a233fe81c4a9e4e
diff --cc test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
index 292b576,2b48032..1da23ea
--- a/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
+++ b/test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
@@@ -27,9 -28,8 +28,10 @@@ import jalview.gui.JvOptionPane
  import jalview.io.FileLoader;
  import jalview.io.FormatAdapter;
  
 +import java.util.Arrays;
 +
  import org.testng.Assert;
+ import org.testng.annotations.BeforeClass;
  import org.testng.annotations.Test;
  
  public class FeatureScoreModelTest