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

fix src/displayapp/screens/settings/SettingWatchFace.h after merge mess

Browse source
This commit is contained in:
ecarlett 2024-05-29 15:37:19 +02:00
parent 6475d6e624
commit a250fa45ec
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/displayapp/screens/settings/SettingWatchFace.h
View file

@ -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"