Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
vgantchev committed Sep 27, 2024
1 parent 36acba5 commit 4446e08
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions runtime/hydradx/src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@ use frame_support::{
};
use frame_system::EnsureRoot;
use hydradx_adapters::{OraclePriceProvider, RelayChainBlockNumberProvider};
use pallet_transaction_multi_payment::{DepositAll, TransferFees};
use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
use primitives::constants::{
chain::{CORE_ASSET_ID, MAXIMUM_BLOCK_WEIGHT},
currency::{deposit, CENTS, DOLLARS, MILLICENTS},
time::{DAYS, HOURS, SLOT_DURATION},
};
use scale_info::TypeInfo;

pub struct CallFilter;
Expand Down

0 comments on commit 4446e08

Please sign in to comment.