[65-libyang-pool] Addressed rebase conflicts

diff --git a/src/lib/yang/Makefile.am b/src/lib/yang/Makefile.am
index 22ae5a775161a7bb891dce215c66247d97795011..05164cd16bd7c051615c5c9ede300172f2517851 100644 (file)
--- 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.