diff options
author | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 +0000 |
---|---|---|
committer | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 +0000 |
commit | cc259b6a4ac93d507fa372a41ea653dedeb791ea (patch) | |
tree | 3c8b8b937b2b91149003195679ce5acda1154c4d /src/components/ble/MusicService.cpp | |
parent | 94561b233136334c7507925b04a345adb0e6c769 (diff) | |
parent | e0013e730448f4dc142e3610f970f22c807ac41e (diff) |
resolves conflicts
Diffstat (limited to 'src/components/ble/MusicService.cpp')
-rw-r--r-- | src/components/ble/MusicService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/ble/MusicService.cpp b/src/components/ble/MusicService.cpp index 74fe9522..3457ce4c 100644 --- a/src/components/ble/MusicService.cpp +++ b/src/components/ble/MusicService.cpp @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#include "MusicService.h" +#include "components/ble/MusicService.h" #include "systemtask/SystemTask.h" namespace { |