resolve merge conflict
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
This commit is contained in:
parent
cffafb6a6b
commit
e250ddc43e
@ -24,11 +24,7 @@ class MutexIF;
|
||||
* @brief Manages handling of SD cards like switching them on or off or getting the current
|
||||
* state
|
||||
*/
|
||||
<<<<<<< HEAD
|
||||
class SdCardManager : public SystemObject {
|
||||
=======
|
||||
class SdCardManager : public SystemObject, public SdCardMountedIF {
|
||||
>>>>>>> mueller/plpcdu-sus-updates
|
||||
friend class SdCardAccess;
|
||||
|
||||
public:
|
||||
|
Loading…
Reference in New Issue
Block a user