[65-libyang-database_rebased] Addressed rebase conflicts

diff --cc src/lib/yang/Makefile.am
index 9df3306b8b898c9465f09bd7d9aff17fe22ff3c5,11b924f62ca8353edd33fbd6117cf26a93e9e0ea..935839e327fbdcdde6b0067973b3dfb3f6d728f6
--- 1/src/lib/yang/Makefile.am
--- 2/src/lib/yang/Makefile.am
+++ b/src/lib/yang/Makefile.am
@@@ -8,11 -8,11 +8,13 @@@ 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_database.cc translator_database.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
  libkea_yang_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la
@@@ -29,8 -29,8 +31,9 @@@ libkea_yang_include_HEADERS = 
        adaptor.h \
        sysrepo_error.h \
        translator.h \
 -      translator_option_data.h
+       translator_database.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,8dcb01d6772fb8a43bbb3e944eee29300413179a..69206d5b729dc5b175230181ebd902adf2d69d25
--- 1/src/lib/yang/tests/Makefile.am
--- 2/src/lib/yang/tests/Makefile.am
+++ b/src/lib/yang/tests/Makefile.am
@@@ -20,8 -20,8 +20,9 @@@ 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_database_unittests.cc
  run_unittests_SOURCES += translator_option_data_unittests.cc
 +run_unittests_SOURCES += translator_option_def_unittests.cc
  run_unittests_SOURCES += run_unittests.cc
  run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
  run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)