From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 11 Jun 2020 13:30:48 +0000 (+0300)
Subject: [#1232] regenerated files
X-Git-Tag: Kea-1.7.9~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ae48038371bfe7e54c1929ca6dbc6b45e099f34;p=thirdparty%2Fkea.git

[#1232] regenerated files
---

diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc
index 1b1a75b084..819631645b 100644
--- a/src/bin/dhcp6/dhcp6_messages.cc
+++ b/src/bin/dhcp6/dhcp6_messages.cc
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Thu May 21 2020 12:11
-=======
-// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Sun May 24 2020 11:35
->>>>>>> [#1232] Added a try and log
+// File created from ../../../src/bin/dhcp6/dhcp6_messages.mes on Thu Jun 11 2020 16:04
 
 #include <cstddef>
 #include <log/message_types.h>