fix versions

ebioman · Sep 27, 2024 · 3e524f1 · 3e524f1
2 parents f3a5f9e + f0d817f
commit 3e524f1
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,7 @@ Note:
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+<<<<<<< HEAD
 rust-htslib = "0.40.2"
 #regex = "1"
 clap = "4.1.6"
@@ -28,3 +29,18 @@ bambam = {git = "https://github.com/ebioman/bambam"}
 crossbeam = "0.8.2"
 crossbeam-channel = "0.5.6"
 rayon = "1.6.1"
+=======
+rust-htslib = { version = "0.46.0", default-features = false }
+#regex = "1"
+log = "0.4.22"
+env_logger = "0.11.5"
+clap = "2.26.0"
+csv = "*"
+chrono = "*"
+bio = "2.0.3"
+itertools = "0.13.0"
+bambam = {git = "https://github.com/ebioman/bambam"}
+crossbeam = "0.8.4"
+crossbeam-channel = "*"
+rayon = "1.10.0"
+>>>>>>> dev