delete leftovers from merge

paritytech · Dec 10, 2024 · 1a91cdd · 1a91cdd
1 parent a826b68
commit 1a91cdd
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/substrate/frame/transaction-payment/src/tests.rs b/substrate/frame/transaction-payment/src/tests.rs
@@ -841,8 +841,6 @@ fn genesis_default_works() {
 		assert_eq!(NextFeeMultiplier::<Runtime>::get(), Multiplier::saturating_from_integer(1));
 	});
 }
-<<<<<<< HEAD
-=======
 
 #[test]
 fn no_fee_and_no_weight_for_other_origins() {
@@ -917,4 +915,3 @@ fn fungible_adapter_no_zero_refund_action() {
 		);
 	});
 }
->>>>>>> f520adb0 (Zero refund check for FungibleAdapter (#6506))