[#62] Fix CHANGELOG.md

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
2023-02-20 14:18:55 +03:00 · 2023-02-20 14:18:55 +03:00 · 5303736acd
parent 22f3c7d080
commit 5303736acd
1 changed files with 2 additions and 4 deletions
--- 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 (신도, 信島)