[65-libyang-logger_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 899bb78bef90a00e50a6aebcbf199d9831dd8055,e5ecff2a89396174c269fd8ddd03ee6853c1ea07..b61f3b9881a993c96c5a2d199177584821261091
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -10,7 -10,7 +10,8 @@@ libkea_yang_la_SOURCES += sysrepo_error
  libkea_yang_la_SOURCES += translator.cc translator.h
  libkea_yang_la_SOURCES += translator_control_socket.cc
  libkea_yang_la_SOURCES += translator_control_socket.h
 +libkea_yang_la_SOURCES += translator_database.cc translator_database.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
@@@ -36,7 -35,7 +37,8 @@@ libkea_yang_include_HEADERS = 
        sysrepo_error.h \
        translator.h \
        translator_control_socket.h \
 +      translator_database.h \
+       translator_logger.h \
        translator_option_data.h \
        translator_option_def.h \
        translator_pool.h \

diff --cc src/lib/yang/tests/Makefile.am
index e7646371f7c1c22b51b721681761a100c2d760b7,125d1f77e6ad98465075fa1e2b11f4b0eff6be58..545078bfb954b250f91ba6f660efad6289e6749a
--- 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_control_socket_unittests.cc
 +run_unittests_SOURCES += translator_database_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_pool_unittests.cc