MAINT: fix merge conflicts

include/caosdb/logging.h

@@ -64,12 +64,10 @@ class TraceEnterLeaveLogger {
 public:
   inline TraceEnterLeaveLogger(const std::string &channel, const std::string &function_name)
     : channel(channel), function_name(function_name) {
-    BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), this->channel, CAOSDB_LOG_LEVEL_TRACE)
-      << "Enter " << this->function_name;
+    caosdb::logging::LoggerOutputStream::get(this->channel, CAOSDB_LOG_LEVEL_TRACE) << "Enter " << this->function_name;
   }
   inline ~TraceEnterLeaveLogger() {
-    BOOST_LOG_CHANNEL_SEV(caosdb::logging::logger::get(), this->channel, CAOSDB_LOG_LEVEL_TRACE)
-      << "Leave " << this->function_name;
+    caosdb::logging::LoggerOutputStream::get(this->channel, CAOSDB_LOG_LEVEL_TRACE) << "Leave " << this->function_name;
   }
 
 private:

include/caosdb/transaction.h

@@ -180,6 +180,7 @@ using caosdb::entity::v1::MultiTransactionResponse;
 using caosdb::entity::v1::RegisterFileUploadRequest;
 using caosdb::entity::v1::RegisterFileUploadResponse;
 using caosdb::transaction::TransactionStatus;
+using RetrieveResponse = caosdb::entity::v1::RetrieveResponse;
 using TransactionResponseCase = caosdb::entity::v1::TransactionResponse::TransactionResponseCase;
 using caosdb::utility::get_arena;
 using google::protobuf::Arena;