mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
fix src/displayapp/screens/settings/SettingWatchFace.h after merge mess
This commit is contained in:
parent
dbc1dcfbdf
commit
e8b1b94507
|
@ -10,11 +10,7 @@
|
|||
#include "displayapp/screens/Symbols.h"
|
||||
#include "displayapp/screens/CheckboxList.h"
|
||||
#include "displayapp/screens/WatchFaceInfineat.h"
|
||||
<<<<<<< HEAD
|
||||
#include "displayapp/screens/WatchFaceInfineatColors.h"
|
||||
=======
|
||||
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
|
||||
#include "displayapp/screens/WatchFaceMeow.h"
|
||||
include "displayapp/screens/WatchFaceMeow.h"
|
||||
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue