From 150c5e632caa37ea7351a42e3ed8a1af7379973f Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 28 Sep 2018 14:35:27 +0200 Subject: [PATCH] [65-libyang-pool] Addressed rebase conflicts --- src/lib/yang/Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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. -- 2.47.2