From d1067a6c70a0184b8800ef286df1fcce7e4017f3 Mon Sep 17 00:00:00 2001
From: aschwinn <al.schwinn@gsi.de>
Date: Thu, 4 May 2017 13:22:45 +0200
Subject: [PATCH] unmerged difference between master and branch fixed
---
.../silecs-communication/interface/equipment/SilecsPLC.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp b/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp
index ed0fabb..4db7910 100644
--- a/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp
+++ b/silecs-communication-cpp/src/silecs-communication/interface/equipment/SilecsPLC.cpp
@@ -240,11 +240,7 @@ namespace Silecs
{
if( pDeviceIter->second->hasBlock((*blockIter)->getName()))
{
- LOG(COMM) << "Updating block '" << (*blockIter)->getName() << "' for device '" << pDeviceIter->second->getLabel()<< "'";
-<<<<<<< HEAD
- //pDeviceIter->second->keepMasterRegisters(pBlock->getName());
-=======
->>>>>>> refs/heads/gsi-1.0.x_centOS7
+ LOG(COMM) << "Updating block '" << (*blockIter)->getName() << "' for device '" << pDeviceIter->second->getLabel()<< "'";
pDeviceIter->second->recv((*blockIter)->getName());
}
}
--
GitLab