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/UserApps.h

Browse source 
after merge mess
This commit is contained in:
ecarlett 2024-05-29 15:35:21 +02:00 committed by Eve C
parent d1c00370d1
commit dbc1dcfbdf
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/displayapp/UserApps.h
View file

@ -12,10 +12,6 @@
#include "displayapp/screens/WatchFaceAnalog.h"
#include "displayapp/screens/WatchFaceCasioStyleG7710.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/WatchFacePineTimeStyle.h"
#include "displayapp/screens/WatchFaceTerminal.h"