rebase on main through remote branch

starkware-libs · Sep 29, 2024 · 8491603 · 8491603
1 parent 97a59b1
commit 8491603
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/crates/blockifier/src/transaction/transactions_test.rs b/crates/blockifier/src/transaction/transactions_test.rs
@@ -119,11 +119,6 @@ use crate::transaction::objects::{
     HasRelatedFeeType,
     TransactionExecutionInfo,
     TransactionInfo,
-<<<<<<< HEAD
-=======
-    TransactionInfoCreator,
-    TransactionResources,
->>>>>>> 7dd654163 (chore(blockifier): have charge_fee flag represent enforce_fee return value)
 };
 use crate::transaction::test_utils::{
     account_invoke_tx,