[65-libyang-logger_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 5078360b70707276595afe2dde3ff5c37fd585c1,8bb0f5e83531a4d16f0a15cb8ee496b2ad24cfaf..e5ecff2a89396174c269fd8ddd03ee6853c1ea07
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -8,8 -8,7 +8,9 @@@ 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_control_socket.cc
 +libkea_yang_la_SOURCES += translator_control_socket.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
@@@ -33,7 -32,7 +34,8 @@@ libkea_yang_include_HEADERS = 
        adaptor.h \
        sysrepo_error.h \
        translator.h \
 +      translator_control_socket.h \
+       translator_logger.h \
        translator_option_data.h \
        translator_option_def.h \
        translator_pool.h \

diff --cc src/lib/yang/tests/Makefile.am
index 155789f4f43163cd06dcd0ebf22e7f291dd9f36e,f919ff9d431a09d94e8640c40920c2f2f618e7a8..125d1f77e6ad98465075fa1e2b11f4b0eff6be58
--- 1/src/lib/yang/tests/Makefile.am
--- 2/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -20,7 -20,7 +20,8 @@@ 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_control_socket_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