From c3ecc727b63595851c521cea97b0bea07e84b1d3 Mon Sep 17 00:00:00 2001 From: jtguibas Date: Thu, 19 Dec 2024 10:50:51 +0000 Subject: [PATCH] cargo --- examples/Cargo.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 3837e2a22..73bcf63be 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -66,11 +66,7 @@ serde_json = "1.0.132" tracing = "0.1.40" [patch.crates-io] -<<<<<<< HEAD -curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", tag = "curve25519_dalek-v4.1.3-patch-v1" } -======= curve25519-dalek = { git = "https://github.com/sp1-patches/curve25519-dalek", tag = "patch-v4.1.3-v3.4.0" } ->>>>>>> origin/main curve25519-dalek-ng = { git = "https://github.com/sp1-patches/curve25519-dalek-ng", tag = "curve25519_dalek_ng-v4.1.1-patch-v1" } ecdsa-core = { git = "https://github.com/sp1-patches/signatures", package = "ecdsa", branch = "umadayal/secp256r1" } ed25519-consensus = { git = "https://github.com/sp1-patches/ed25519-consensus", tag = "ed25519_consensus-v2.1.0-patch-v1" }