From caa91c55237697770eab7ff7eb898e4aabf54f0b Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Wed, 14 Jul 2021 13:07:35 +0200
Subject: [PATCH] Remove dynamic cast because it lead to errors again and agin
 (Poco::AutoPtr don't work correct with that)

---
 login_server/src/cpp/SingletonManager/PendingTasksManager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp
index f3faae6bf..35ab6b7e1 100644
--- a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp
+++ b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp
@@ -162,10 +162,13 @@ std::vector<Poco::AutoPtr<model::gradido::Transaction>> PendingTasksManager::get
 	// TODO: don't use cast here, because can lead to errors
 	Poco::ScopedLock<Poco::Mutex> _lock(mWorkMutex);
 	std::vector<Poco::AutoPtr<model::gradido::Transaction>> transactions_to_sign;
+<<<<<<< HEAD
 
 	if (user->getModel()->getRole() != model::table::ROLE_ADMIN) {
 		return transactions_to_sign;
 	}
+=======
+>>>>>>> Remove dynamic cast because it lead to errors again and agin (Poco::AutoPtr don't work correct with that)
 
 	for (auto map_it = mPendingGradidoTransactions.begin(); map_it != mPendingGradidoTransactions.end(); map_it++)
 	{