From: Francis Dupont <fdupont@isc.org>
Date: Fri, 28 Sep 2018 12:35:27 +0000 (+0200)
Subject: [65-libyang-pool] Addressed rebase conflicts
X-Git-Tag: 153-netconf-control-socket_base~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=150c5e632caa37ea7351a42e3ed8a1af7379973f;p=thirdparty%2Fkea.git

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

diff --git a/src/lib/yang/Makefile.am b/src/lib/yang/Makefile.am
index 22ae5a7751..05164cd16b 100644
--- a/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@ -31,11 +31,8 @@ libkea_yang_include_HEADERS = \
 	sysrepo_error.h \
 	translator.h \
 	translator_option_data.h \
-<<<<<<< HEAD
-	translator_option_def.h
-=======
+	translator_option_def.h \
 	translator_pool.h
->>>>>>> 65-libyang-pool
 
 EXTRA_DIST = yang.dox
 # Distribute yang models.