[3732a] Fixed merged of ctrl_dhcp6_srv.h (I misread dhcp6_srv.h, oops)

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.h b/src/bin/dhcp6/ctrl_dhcp6_srv.h
index 763c4e97dfd5d0f1565701eade07e8bcdedba9e4..0c7d277a0670d16c84e71cddb9345e3e80d3dbad 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.h
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.h
@@ -25,18 +25,8 @@ namespace dhcp {
 
 /// @brief Controlled version of the DHCPv6 server
 ///
-<<<<<<< HEAD
-/// This is a class that is responsible for DHCPv6 server being controllable.
-/// It does various things, depending on the configuration backend.
-/// For Bundy backend it establishes a connection with msgq and later receives
-/// commands over it. For Kea backend, it reads configuration file from disk.
-///
-/// For detailed explanation or relations between main(), ControlledDhcpv6Srv,
-/// Dhcpv6Srv and other classes, see \ref dhcpv6Session.
-=======
 /// This is a class that is responsible for DHCPv6 server being controllable,
 /// by reading configuration file from disk.
->>>>>>> trac3732
 class ControlledDhcpv6Srv : public isc::dhcp::Dhcpv6Srv {
 public: