[65-libyang-logger_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 9df3306b8b898c9465f09bd7d9aff17fe22ff3c5,c22748fee59b618b0b68d66834189f36ef1b36bd..b36ca9641f0bff6cff57fbf50747bf3889c939ee
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -8,10 -8,9 +8,11 @@@ lib_LTLIBRARIES = libkea-yang.l
  libkea_yang_la_SOURCES  = adaptor.cc adaptor.h
  libkea_yang_la_SOURCES += sysrepo_error.h
  libkea_yang_la_SOURCES += translator.cc translator.h
+ libkea_yang_la_SOURCES += translator_logger.cc translator_logger.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_LIBADD =  $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la
@@@ -29,8 -28,8 +30,9 @@@ libkea_yang_include_HEADERS = 
        adaptor.h \
        sysrepo_error.h \
        translator.h \
 -      translator_option_data.h
+       translator_logger.h \
 +      translator_option_data.h \
 +      translator_option_def.h
  
  EXTRA_DIST = yang.dox
  # Distribute yang models.

diff --cc src/lib/yang/tests/Makefile.am
index ec2f7ede94181ca8655ab6da5fe7a070d4485cad,a708e3f73b45c3032f7065bc78a112617a799f3c..6d29445b3664315ad21390abffa27446e0d89102
--- 1/src/lib/yang/tests/Makefile.am
--- 2/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -20,8 -20,9 +20,10 @@@ TESTS += run_unittest
  run_unittests_SOURCES  = adaptor_unittests.cc
  run_unittests_SOURCES += sysrepo_setup.h
  run_unittests_SOURCES += translator_unittests.cc
+ run_unittests_SOURCES += translator_logger_unittests.cc
  run_unittests_SOURCES += translator_option_data_unittests.cc
 +run_unittests_SOURCES += translator_option_def_unittests.cc
+ run_unittests_SOURCES  = translator_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)