From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 19 Feb 2021 18:19:05 +0000 (-0500)
Subject: [#1635] Fixed Changelog (again)
X-Git-Tag: Kea-1.9.5~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6d19aa4390f72edf124a91e5ff4f5102bbc8792;p=thirdparty%2Fkea.git

[#1635] Fixed Changelog (again)
---

diff --git a/ChangeLog b/ChangeLog
index 33abe85a6a..55b64ea5bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,8 +76,6 @@
 	existing configurations to get the desired values.
 	(Gitlab #1672)
 
-=======
->>>>>>> [#1635] Fixed trailing whitespace in ChangeLog
 Kea 1.9.4 (development) released on Jan 27, 2021
 
 1860.	[build]		razvan