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

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 -4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8b1fef730d - Show all commits

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.