Remove merge conflict artefact

filecoin-project · Jan 17, 2024 · 73d830e · 73d830e
1 parent 330afff
commit 73d830e
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -196,8 +196,6 @@ This patch release allows for up to 10k messages per block. Additionally, it int
 ## Improvements
 - fix: exchange: allow up to 10k messages per block ([filecoin-project/lotus#11506](https://github.com/filecoin-project/lotus/pull/11506))
 
->>>>>>> releases
-
 # v 1.25.0 / 2023-11-22
 
 This is a highly recommended feature release of Lotus. This optional release supports the Filecoin network version 21 upgrade, codenamed Watermelon 🍉, in addition to the numerous improvements and enhancements for node operators, ETH RPC-providers and storage providers.