[master] Fixed conflict in ChangeLog

diff --cc ChangeLog
index 40ef1a2a0c6b6e73ad1e7bad73d8fc19a65c61e2,5525a10268f3a07151c024bef06ce3831977c60f..ab92bb6eb97b546d5e7efc82e70582f8515b1251
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 -1466. [doc]           fdupont, tomek
++1467. [doc]           fdupont, tomek
+       Doxygen errors fixed.
+       (Gitlab #180,!93, git d12fb04d71c3b2d0e84ebb2c957334454b5705c4)
+ 
 +1466. [func]          fdupont
 +      Added random number generation in services provided by
 +      the crypto library (and ultimately by the crypto backend,
 +      i.e. Botan or OpenSSL).
 +      (Gitlab #29,!9, git 609ddc69613dc828b3d93673d61a2c259c3944aa)
 +
  1465. [build]         marcin
        Removed libkea-process dependency on MySQL, Postgres and
        Cassandra libraries.