From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 17 Feb 2021 19:35:32 +0000 (-0500)
Subject: [#1635] Fixed trailing whitespace in ChangeLog
X-Git-Tag: Kea-1.9.5~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17ceb35884737b7cfcb33501786d985d2ee57b35;p=thirdparty%2Fkea.git

[#1635] Fixed trailing whitespace in ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 55b64ea5bb..33abe85a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,6 +76,8 @@
 	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