chore: fix merge conflicts

0xPolygonMiden · Oct 28, 2024 · bb307b7 · bb307b7
1 parent 831bf3d
commit bb307b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -49,7 +49,7 @@ winter-utils = { package = "winter-utils", version = "0.10", default-features =
 [dev-dependencies]
 loom = "0.7"
 proptest = "1.5"
-rand_utils = { git = "https://github.com/facebook/winterfell", branch = "next", package = "winter-rand-utils" }
+rand-utils = { package = "winter-rand-utils", version = "0.10" }
 
 [target.'cfg(loom)'.dependencies]
 loom = "0.7"