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/CMakeLists.txt after merge mess

Browse source
This commit is contained in:
ecarlett 2024-05-29 15:26:59 +02:00 committed by Eve C
parent ad19b9e798
commit 99d223b4d1
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/CMakeLists.txt
View file

@ -371,15 +371,7 @@ list(APPEND SOURCE_FILES
displayapp/screens/StopWatch.cpp
displayapp/screens/BatteryIcon.cpp
displayapp/screens/BleIcon.cpp
<<<<<<< HEAD
<<<<<<< HEAD
displayapp/screens/AlarmIcon.cpp
=======
displayapp/screens/AlarmIcon.cpp
>>>>>>> f5dfbc44 (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
=======
displayapp/screens/AlarmIcon.cpp
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
displayapp/screens/NotificationIcon.cpp
displayapp/screens/SystemInfo.cpp
displayapp/screens/Label.cpp