KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
Robin Müller 2020-05-17 18:02:58 +02:00
parent 234fd8e300
commit 8b1fef730d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devicehandlers/DeviceHandlerBase.h
View File

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