eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

resolve merge conflict
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-02-28 15:20:46 +01:00
parent cffafb6a6b
commit e250ddc43e
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp_q7s/memory/SdCardManager.h
View File

@ -24,11 +24,7 @@ class MutexIF;
* @brief Manages handling of SD cards like switching them on or off or getting the current * @brief Manages handling of SD cards like switching them on or off or getting the current
* state * state
*/ */
<<<<<<< HEAD
class SdCardManager : public SystemObject {
=======
class SdCardManager : public SystemObject, public SdCardMountedIF { class SdCardManager : public SystemObject, public SdCardMountedIF {
>>>>>>> mueller/plpcdu-sus-updates
friend class SdCardAccess; friend class SdCardAccess;
public: public: