Merge remote-tracking branch 'fork/rk-new-broker-price-adapter' into …

…rk-new-broker-price-adapter
polkadot-fellows · Jun 5, 2024 · fa32cf7 · fa32cf7
2 parents 46219f8 + 001a7e8
commit fa32cf7
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Transaction payments work via new `fungible` trait implementation ([polkadot-fellows/runtimes#332](https://github.com/polkadot-fellows/runtimes/pull/332))
 - Block `request_judgement` calls on the Relay Chain ([polkadot-fellows/runtimes#338](https://github.com/polkadot-fellows/runtimes/pull/338))
->>>>>>> origin/main
 
 ### Fixed