[65-libyang-pool_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 9df3306b8b898c9465f09bd7d9aff17fe22ff3c5,44bdcfd5aee817b0d98e28eeaf0a2aac34c64cb1..22ae5a775161a7bb891dce215c66247d97795011
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -10,8 -10,7 +10,9 @@@ libkea_yang_la_SOURCES += sysrepo_error
  libkea_yang_la_SOURCES += translator.cc translator.h
  libkea_yang_la_SOURCES += translator_option_data.cc
  libkea_yang_la_SOURCES += translator_option_data.h
 +libkea_yang_la_SOURCES += translator_option_def.cc
 +libkea_yang_la_SOURCES += translator_option_def.h
+ libkea_yang_la_SOURCES += translator_pool.cc translator_pool.h
  
  libkea_yang_la_LIBADD =  $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
@@@ -30,7 -29,7 +31,11 @@@ libkea_yang_include_HEADERS = 
        sysrepo_error.h \
        translator.h \
        translator_option_data.h \
++<<<<<<< HEAD
 +      translator_option_def.h
++=======
+       translator_pool.h
++>>>>>>> 65-libyang-pool
  
  EXTRA_DIST = yang.dox
  # Distribute yang models.

diff --cc src/lib/yang/tests/Makefile.am
index ec2f7ede94181ca8655ab6da5fe7a070d4485cad,18f855b07886fac12f29fce0fa32ea085294d569..58018a599b0600a22723208167277bf661f90466
--- 1/src/lib/yang/tests/Makefile.am
--- 2/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -21,7 -21,7 +21,8 @@@ run_unittests_SOURCES  = adaptor_unitte
  run_unittests_SOURCES += sysrepo_setup.h
  run_unittests_SOURCES += translator_unittests.cc
  run_unittests_SOURCES += translator_option_data_unittests.cc
 +run_unittests_SOURCES += translator_option_def_unittests.cc
+ run_unittests_SOURCES += translator_pool_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)