From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 22 Aug 2024 14:49:46 +0000 (+0100)
Subject: Merge branch 'develop' into feature/JAL-3576intervalStore_1_2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeature%2FJAL-3576intervalStore_1_2;p=jalview.git

Merge branch 'develop' into feature/JAL-3576intervalStore_1_2
---

2ac00907dd4b7777add99046c57c0945d2d2f653
diff --cc test/jalview/io/vcf/VCFLoaderTest.java
index c8dd8f0,2b418de..ca10b55
--- a/test/jalview/io/vcf/VCFLoaderTest.java
+++ b/test/jalview/io/vcf/VCFLoaderTest.java
@@@ -5,17 -25,8 +25,18 @@@ import static org.testng.Assert.assertE
  import static org.testng.Assert.assertNull;
  import static org.testng.Assert.assertTrue;
  
 +import java.io.File;
 +import java.io.IOException;
 +import java.io.PrintWriter;
 +import java.util.List;
 +import java.util.Map;
 +
 +import org.testng.annotations.BeforeClass;
 +import org.testng.annotations.BeforeTest;
 +import org.testng.annotations.Test;
 +
  import jalview.bin.Cache;
+ import jalview.bin.Console;
  import jalview.datamodel.AlignmentI;
  import jalview.datamodel.DBRefEntry;
  import jalview.datamodel.Mapping;