mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
fix src/displayapp/UserApps.h
after merge mess
This commit is contained in:
parent
d1c00370d1
commit
dbc1dcfbdf
|
@ -12,10 +12,6 @@
|
||||||
#include "displayapp/screens/WatchFaceAnalog.h"
|
#include "displayapp/screens/WatchFaceAnalog.h"
|
||||||
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
|
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
|
||||||
#include "displayapp/screens/WatchFaceInfineat.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/WatchFacePineTimeStyle.h"
|
#include "displayapp/screens/WatchFacePineTimeStyle.h"
|
||||||
#include "displayapp/screens/WatchFaceTerminal.h"
|
#include "displayapp/screens/WatchFaceTerminal.h"
|
||||||
|
|
Loading…
Reference in a new issue