[master] Added ChangeLog entry 1333 for #5275.

ChangeLog

+1333.	[doc]		tmark
+	Added a discussion of conflict resoltuion to the DHCP-DDNS chapter
+	of the Kea admin guide.
+	(Trac #5275, git ce3fe30524cdc21a9cabeafbdcb2fc3cd2e86cff)
+
 1332.	[doc]		tomek
 	Clarified list of supported options, added examples for using
 	hex notation to specify option values.
@@ -39,8 +44,8 @@
 	(Trac #5393, git 0964c66d44516a04ec62c8e70be92f216fe3df5a)
 
 1324.   [doc]           wlodek
-        Added examples of configuration for iPXE boot with DHCPv6 Kea server
-        (Trac #5356, git c68b9b381930d1e44fd5daa1b9d033035e32cff2)
+	Added examples of configuration for iPXE boot with DHCPv6 Kea server
+	(Trac #5356, git c68b9b381930d1e44fd5daa1b9d033035e32cff2)
 
 1323.	[doc]		marcin
 	Added new section to Kea Hooks Developer's Guide describing how