mirror of
https://github.com/DarkFlippers/unleashed-firmware.git
synced 2025-12-12 20:49:49 +04:00
Fix merge issues
This commit is contained in:
@@ -9,7 +9,6 @@
|
|||||||
#include "../views/desktop_view_main.h"
|
#include "../views/desktop_view_main.h"
|
||||||
#include "desktop_scene.h"
|
#include "desktop_scene.h"
|
||||||
#include "desktop_scene_i.h"
|
#include "desktop_scene_i.h"
|
||||||
#include "../helpers/pin_lock.h"
|
|
||||||
|
|
||||||
#define TAG "DesktopSrv"
|
#define TAG "DesktopSrv"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user