From ab79168b13a5680557147de098c740bca974392e Mon Sep 17 00:00:00 2001
From: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri, 14 Oct 2022 20:19:25 +0300
Subject: [PATCH] all: fix chlog

---
 CHANGELOG.md | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbeec92c..e8af7f0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,20 +54,10 @@ and this project adheres to
 
 See also the [v0.107.17 GitHub milestone][ms-v0.107.17].
 
-<<<<<<< HEAD
-[ms-v0.107.16]: https://github.com/AdguardTeam/AdGuardHome/milestone/52?closed=1
-||||||| bf792b83f
-[ms-v0.107.16]:   https://github.com/AdguardTeam/AdGuardHome/milestone/52?closed=1
-=======
-[ms-v0.107.17]:   https://github.com/AdguardTeam/AdGuardHome/milestone/52?closed=1
->>>>>>> master
+[ms-v0.107.17]: https://github.com/AdguardTeam/AdGuardHome/milestone/52?closed=1
 -->
 
 
-<<<<<<< HEAD
-||||||| bf792b83f
-
-=======
 
 ## [v0.107.16] - 2022-10-07
 
@@ -84,7 +74,6 @@ were resolved.
 
 
 
->>>>>>> master
 ## [v0.107.15] - 2022-10-03
 
 See also the [v0.107.15 GitHub milestone][ms-v0.107.15].