From: Francis Dupont <fdupont@isc.org>
Date: Sat, 13 Jun 2015 09:07:52 +0000 (+0200)
Subject: [3732a] Fixed merged of ctrl_dhcp6_srv.h (I misread dhcp6_srv.h, oops)
X-Git-Tag: trac3830_base~3^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcffaf069d5ed3de713f13a628c1afb496987d1d;p=thirdparty%2Fkea.git

[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 763c4e97df..0c7d277a06 100644
--- 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: