[#1662] Fixed rebase

diff --git a/ChangeLog b/ChangeLog
index 2348f3c0b3e85204341f25f94825f8451ab9cedc..bee9c763478e90856cbe8e396ac87948e556f8df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,4 @@
 1864.  [func]          fdupont
-       New parameters to handle upcoming TLS support added in
-       Control Agent config: "trust-anchor", "cert-file",
-       "key-file" and "cert-required". They can be configured,
-       but their values are not used yet. This will be
-       implemented in a future ticket.
-
-1863.  [func]          fdupont
        New parameters to handle TLS support added in Control Agent
        config: "trust-anchor", "cert-file", "key-file" and
        "cert-required". They can be configured, but their values are