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

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

4f342d98b76ef5f7902874cb175f4acb328f7e0b
diff --cc src/lib/yang/Makefile.am
index 5078360b70,fff4cd24f4..6a6c5451a0
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -33,7 -32,7 +34,8 @@@ libkea_yang_include_HEADERS = 
  	adaptor.h \
  	sysrepo_error.h \
  	translator.h \
 +	translator_control_socket.h \
+ 	translator_host.h \
  	translator_option_data.h \
  	translator_option_def.h \
  	translator_pool.h \