# Conflicts:
#	src/bin/dhcp4/json_config_parser.cc
#	src/bin/dhcp4/tests/fqdn_unittest.cc
#	src/bin/dhcp6/dhcp6_srv.h
#	src/bin/dhcp6/tests/fqdn_unittest.cc
#	src/lib/config/command_mgr.h
#	src/lib/dhcpsrv/alloc_engine.h
#	src/lib/dhcpsrv/parsers/client_class_def_parser.h
#	src/lib/dhcpsrv/parsers/dbaccess_parser.cc
#	src/lib/dhcpsrv/parsers/dhcp_parsers.cc
#	src/lib/dhcpsrv/parsers/dhcp_parsers.h
#	src/lib/dhcpsrv/srv_config.h
#	src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
#	src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
#	src/lib/eval/eval_context.h
#	src/lib/hooks/callout_manager.cc
#	src/lib/testutils/dhcp_test_lib.sh.in