Commit bcffaf06 authored by Francis Dupont's avatar Francis Dupont
Browse files

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

parent 661da749
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment