From: Francis Dupont <fdupont@isc.org>
Date: Tue, 16 Oct 2018 15:46:57 +0000 (+0200)
Subject: [65-libyang-host_rebased] Addressed rebase conflicts
X-Git-Tag: 153-netconf-agent_base~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=badc96f57b87dbbc3b636e696c4a9859d0a661b2;p=thirdparty%2Fkea.git

[65-libyang-host_rebased] Addressed rebase conflicts
---

badc96f57b87dbbc3b636e696c4a9859d0a661b2
diff --cc src/lib/yang/Makefile.am
index 899bb78bef,6a6c5451a0..4cc6efac0c
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -16,9 -15,9 +16,10 @@@ libkea_yang_la_SOURCES += translator_op
  libkea_yang_la_SOURCES += translator_option_def.cc
  libkea_yang_la_SOURCES += translator_option_def.h
  libkea_yang_la_SOURCES += translator_pool.cc translator_pool.h
+ libkea_yang_la_SOURCES += translator_host.cc translator_host.h
  libkea_yang_la_SOURCES += yang_models.h
  
 +
  libkea_yang_la_LIBADD =  $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
@@@ -36,7 -35,7 +37,8 @@@ libkea_yang_include_HEADERS = 
  	sysrepo_error.h \
  	translator.h \
  	translator_control_socket.h \
 +	translator_database.h \
+ 	translator_host.h \
  	translator_option_data.h \
  	translator_option_def.h \
  	translator_pool.h \