haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 23:21:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix Apps.h.in and src/components/settings/Settings.h after merge mess

Browse source
This commit is contained in:
ecarlett 2024-05-29 15:43:30 +02:00
parent a6b932e608
commit 3cfe46ec8f
2 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/components/settings/Settings.h
View file

@ -48,30 +48,14 @@ namespace Pinetime {
struct WatchFaceInfineat { struct WatchFaceInfineat {
bool showSideCover = true; bool showSideCover = true;
bool showAlarmStatus = true; bool showAlarmStatus = true;
<<<<<<< HEAD
int colorIndex = 0; int colorIndex = 0;
}; };
struct WatchFaceInfineatColors {
bool showSideCover = true;
=======
>>>>>>> 70f9025f (now I have the Meow Watchface AND the Infineat Watchface with alarm display)
int colorIndex = 0;
};
<<<<<<< HEAD
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
struct WatchFaceMeow { struct WatchFaceMeow {
bool showSideCover = true; bool showSideCover = true;
int colorIndex = 0; int colorIndex = 0;
}; };
<<<<<<< HEAD
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
Settings(Pinetime::Controllers::FS& fs); Settings(Pinetime::Controllers::FS& fs);
Settings(const Settings&) = delete; Settings(const Settings&) = delete;

4
src/displayapp/apps/Apps.h.in
View file

@ -51,10 +51,6 @@ namespace Pinetime {
PineTimeStyle, PineTimeStyle,
Terminal, Terminal,
Infineat, Infineat,
<<<<<<< HEAD
InfineatColors,
=======
>>>>>>> 504f5774 (copy :( files from gitlab repo)
Meow, Meow,
CasioStyleG7710, CasioStyleG7710,
}; };