[#1232] regenerated files

diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc
index 1b1a75b084411d68a031d9c6376091527eb35209..819631645b84b2f75a8d877d4c8fee923c4822b2 100644 (file)
--- 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>