[#805,!5-p] Updated ChangeLog and conflicted parsers

ChangeLog

@@ -5,7 +5,7 @@
 	lease file loading after which the server will abandon the effort
 	and exit. The default value of 0 disables the limit.
 	CVE:2019-6474
-	(Gitlab #805,!5-p git TBD)
+	(Gitlab #805,!5-p git af7393c517cea37a7091075e5d0d24793bccf013)
 
 1652.	[security]		tmark
 	Prevent the DHCP servers from asserting when malformed

src/bin/dhcp4/location.hh

-<<<<<<< HEAD
-<<<<<<< HEAD
-// A Bison parser, made by GNU Bison 3.4.1.
-=======
 // A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
-=======
-// A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
 
 // Locations for Bison parsers in C++
 

src/bin/dhcp4/position.hh

-<<<<<<< HEAD
-<<<<<<< HEAD
-// A Bison parser, made by GNU Bison 3.4.1.
-=======
 // A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
-=======
-// A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined in "location.hh".

src/bin/dhcp4/stack.hh

-<<<<<<< HEAD
-<<<<<<< HEAD
-// A Bison parser, made by GNU Bison 3.4.1.
-=======
 // A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
-=======
-// A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] Memfile and kea-dhcp4 now suppor max-row-errors parameter
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined with the parser itself.

src/bin/dhcp6/location.hh

-<<<<<<< HEAD
-<<<<<<< HEAD
-// A Bison parser, made by GNU Bison 3.4.1.
-=======
 // A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] kea-dhcp6 now supports max-row-errors parameter
-=======
-// A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] kea-dhcp6 now supports max-row-errors parameter
 
 // Locations for Bison parsers in C++
 

src/bin/dhcp6/position.hh

-<<<<<<< HEAD
-<<<<<<< HEAD
-// A Bison parser, made by GNU Bison 3.4.1.
-=======
 // A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] kea-dhcp6 now supports max-row-errors parameter
-=======
-// A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] kea-dhcp6 now supports max-row-errors parameter
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined in "location.hh".

src/bin/dhcp6/stack.hh

-<<<<<<< HEAD
-<<<<<<< HEAD
-// A Bison parser, made by GNU Bison 3.4.1.
-=======
 // A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] kea-dhcp6 now supports max-row-errors parameter
-=======
-// A Bison parser, made by GNU Bison 3.2.1.
->>>>>>> [#805,!5-p] kea-dhcp6 now supports max-row-errors parameter
 
 // Starting with Bison 3.2, this file is useless: the structure it
 // used to define is now defined with the parser itself.