resolved conflict

This commit is contained in:
Robin Müller 2020-05-17 18:02:58 +02:00
parent 234fd8e300
commit 8b1fef730d

View File

@ -614,11 +614,7 @@ protected:
/**
* Cookie used for communication
*/
<<<<<<< HEAD
CookieIF * comCookie = nullptr;
=======
CookieIF * comCookie;
>>>>>>> mueller_framework
struct DeviceCommandInfo {
bool isExecuting; //!< Indicates if the command is already executing.