fix: little merge conflict

paritytech · Nov 15, 2024 · 38d30c1 · 38d30c1
1 parent 8c627e6
commit 38d30c1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
@@ -1474,15 +1474,10 @@ fn location_conversion_works() {
 
 #[test]
 fn xcm_payment_api_works() {
-<<<<<<< Updated upstream
-	asset_test_utils::test_cases::xcm_payment_api_works::<Runtime, RuntimeCall, RuntimeOrigin, Block>(
-	);
-=======
 	asset_test_utils::test_cases::xcm_payment_api_works::<
 		Runtime,
 		RuntimeCall,
 		RuntimeOrigin,
 		Block
 	>();
->>>>>>> Stashed changes
 }
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -1449,15 +1449,10 @@ fn location_conversion_works() {
 
 #[test]
 fn xcm_payment_api_works() {
-<<<<<<< Updated upstream
-	asset_test_utils::test_cases::xcm_payment_api_works::<Runtime, RuntimeCall, RuntimeOrigin, Block>(
-	);
-=======
 	asset_test_utils::test_cases::xcm_payment_api_works::<
 		Runtime,
 		RuntimeCall,
 		RuntimeOrigin,
 		Block
 	>();
->>>>>>> Stashed changes
 }