Merge github master

test/test_unit/test_prepare/test_download.py

@@ -694,8 +694,14 @@ def test_download_refseq_vs_genbank(caplog):
     """
     Give a taxid of a subspecies, download strains from refseq, and then from genbank.
     Currently, no strains in refseq, and 2 in genbank.
+<<<<<<< HEAD
     39831 = Klebsiella pneumoniae subsp. rhinoscleromatis
     (60 = Vitreoscilla sp.)
+=======
+    urrently, no strains in refseq, and 8 in genbank.
+    #39831 = Klebsiella pneumoniae subsp. rhinoscleromatis
+    60 = Vitreoscilla sp.
+>>>>>>> 0896f49 (change taxid to compare refseq vs genbank)
     Later, there can be some in refseq, but always at least 2 more in genbank
     """
     caplog.set_level(logging.INFO)