From: Francis Dupont <fdupont@isc.org>
Date: Wed, 17 Oct 2018 17:31:40 +0000 (+0200)
Subject: [65-libyang-logger_rebased] Addressed rebase conflicts
X-Git-Tag: 153-netconf-configs_base^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f19e1a6a18ddc3a672287aed1a89cfc3f906eb67;p=thirdparty%2Fkea.git

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

f19e1a6a18ddc3a672287aed1a89cfc3f906eb67
diff --cc src/lib/yang/Makefile.am
index 7321b123c5,b61f3b9881..a0f0de8dbe
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -39,7 -38,7 +40,8 @@@ libkea_yang_include_HEADERS = 
  	translator.h \
  	translator_control_socket.h \
  	translator_database.h \
 +	translator_host.h \
+ 	translator_logger.h \
  	translator_option_data.h \
  	translator_option_def.h \
  	translator_pool.h \