unmerged difference between master and branch fixed

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());
 						}
 					}