From 73d830e2fb89c4b0f077771b465cf959dfd2d105 Mon Sep 17 00:00:00 2001
From: Phi <orjan.roren@gmail.com>
Date: Wed, 17 Jan 2024 13:27:09 +0100
Subject: [PATCH] Remove merge conflict artefact

Remove merge conflict artefact
---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5da28470283..9cf98e889bc 100644
--- 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.