From 5303736acd240809c67847c2c898f97a3e419d05 Mon Sep 17 00:00:00 2001
From: Denis Kirillov <d.kirillov@yadro.com>
Date: Mon, 20 Feb 2023 14:18:55 +0300
Subject: [PATCH] [#62] Fix CHANGELOG.md

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
---
 CHANGELOG.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0387beae..4e559219 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,13 +51,11 @@ Changelog for FrostFS Node
 - Minimum go version to v1.18
 
 ### Updating from v0.35.0
-<<<<<<< HEAD
+
 You need to change configuration environment variables to `FROSTFS_*` if you use any.
-||||||| parent of 00afc576d ([#2246] node: Allow to configure tombsone lifetime)
-=======
+
 New config field `object.delete.tombstone_lifetime` allows to set tombstone lifetime
 more appropriate for a specific deployment.
->>>>>>> 00afc576d ([#2246] node: Allow to configure tombsone lifetime)
 
 ## [0.35.0] - 2022-12-28 - Sindo (신도, 信島)