mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
fix Apps.h.in and src/components/settings/Settings.h after merge mess
This commit is contained in:
parent
055b9a93c4
commit
7bab4a66aa
|
@ -48,30 +48,14 @@ namespace Pinetime {
|
|||
struct WatchFaceInfineat {
|
||||
bool showSideCover = true;
|
||||
bool showAlarmStatus = true;
|
||||
<<<<<<< HEAD
|
||||
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 {
|
||||
bool showSideCover = true;
|
||||
int colorIndex = 0;
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
|
||||
|
||||
Settings(Pinetime::Controllers::FS& fs);
|
||||
|
||||
Settings(const Settings&) = delete;
|
||||
|
|
|
@ -52,10 +52,6 @@ namespace Pinetime {
|
|||
PineTimeStyle,
|
||||
Terminal,
|
||||
Infineat,
|
||||
<<<<<<< HEAD
|
||||
InfineatColors,
|
||||
=======
|
||||
>>>>>>> 504f5774 (copy :( files from gitlab repo)
|
||||
Meow,
|
||||
CasioStyleG7710,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue