[gitlab9] Minor conflict resolution

src/bin/netconf/Makefile.am

@@ -75,7 +75,7 @@ kea_netconf_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
 kea_netconf_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
-kea_netconf_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
+kea_netconf_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) $(SYSREPO_LIBS)
 
 
 kea_netconfdir = $(pkgdatadir)

src/bin/netconf/main.cc

@@ -7,6 +7,10 @@
 #include <config.h>
 
 #include <netconf/agent.h>
+#include <netconf/netconf_log.h>
+#include <dhcpsrv/cfgmgr.h>
+#include <exceptions/exceptions.h>
+#include <iostream>
 
 int main(