Skip to content

Commit

Permalink
Fix merge conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
emhane committed Oct 5, 2024
1 parent 45f9b4e commit cf72724
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions crates/primitives/src/transaction/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ pub(crate) mod util;
mod variant;

#[cfg(feature = "optimism")]
pub use op_alloy_consensus::TxDeposit;
use op_alloy_consensus::TxDeposit;
#[cfg(feature = "optimism")]
pub use reth_optimism_chainspec::optimism_deposit_tx_signature;
use reth_optimism_chainspec::optimism_deposit_tx_signature;
#[cfg(feature = "optimism")]
pub use tx_type::DEPOSIT_TX_TYPE_ID;
#[cfg(any(test, feature = "reth-codec"))]
Expand Down

0 comments on commit cf72724

Please sign in to comment.