From 8491603ff6614d0375fbe60a684c41a8b523a005 Mon Sep 17 00:00:00 2001 From: Aviv Greenburg Date: Sun, 29 Sep 2024 14:12:15 +0300 Subject: [PATCH] rebase on main through remote branch --- crates/blockifier/src/transaction/transactions_test.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/crates/blockifier/src/transaction/transactions_test.rs b/crates/blockifier/src/transaction/transactions_test.rs index f658254377..7f9cb7dba8 100644 --- 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,