Merge branch 'develop' into Release_2_9_Branch
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Aug 2015 10:53:18 +0000 (11:53 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Aug 2015 10:53:18 +0000 (11:53 +0100)
Conflicts:
TESTNG (now added to .gitignore)

test/jalview/ws/jabaws/RNAStructExportImport.java

index 87a4ec6..4d29f33 100644 (file)
@@ -49,6 +49,7 @@ import org.testng.annotations.Test;
 
 import compbio.metadata.WrongParameterException;
 
+
 public class RNAStructExportImport
 {
   public static String testseqs = "examples/RF00031_folded.stk";