[#1635] Fixed Changelog (again)

diff --git a/ChangeLog b/ChangeLog
index 33abe85a6ad65cd348b83f3d8da57725b5fa8e5e..55b64ea5bb4bd3b0d9fe047a011f43a78f772f96 100644 (file)
--- 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