-
Stephen Morris authored
Conflicts: doc/devel/mainpage.dox src/bin/dhcp4/ctrl_dhcp4_srv.h src/bin/dhcp4/dhcp4_srv.h src/bin/dhcp6/dhcp6.dox Also modified the following files during the resolution of the merge issues: src/bin/dhcp4/config_parser.cc src/bin/dhcp4/ctrl_dhcp4_srv.cc src/bin/dhcp4/dhcp4.dox src/bin/dhcp6/config_parser.cc src/bin/dhcp6/tests/dhcp6_srv_unittest.cc src/lib/dhcp/option_custom.h src/lib/dhcp/pkt4.h src/lib/dhcpsrv/database_backends.dox
fecfe82b