From: Francis Dupont <fdupont@isc.org>
Date: Mon, 5 Nov 2018 08:27:01 +0000 (+0100)
Subject: [master] Fixed conflict in ChangeLog
X-Git-Tag: 66-authoritative-flag-in-kea_base~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4546f30666f0be8b1fb8350e6310d019d9de4b34;p=thirdparty%2Fkea.git

[master] Fixed conflict in ChangeLog
---

4546f30666f0be8b1fb8350e6310d019d9de4b34
diff --cc ChangeLog
index 40ef1a2a0c,5525a10268..ab92bb6eb9
--- a/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.