From 7e84b2c671525b0b12311481dc27592ed19cc265 Mon Sep 17 00:00:00 2001 From: han0110 Date: Sun, 10 Jul 2022 15:05:12 +0800 Subject: [PATCH] fix: resolve conflict --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 14c51123..2a996930 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,6 +39,7 @@ evm = ["dep:foundry_evm", "dep:crossterm", "dep:tui", "dep:ethereum_types", "dep [patch.crates-io] halo2_proofs = { git = "https://github.com/han0110/halo2", branch = "experiment", package = "halo2_proofs" } +revm = { git = "https://github.com/bluealloy/revm", package = "revm" } [patch."https://github.com/privacy-scaling-explorations/halo2"] halo2_proofs = { git = "https://github.com/han0110/halo2", branch = "experiment", package = "halo2_proofs" }