mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 23:21:53 +02:00
fix src/CMakeLists.txt after merge mess
This commit is contained in:
parent
9a377f6baf
commit
5ac1e90040
|
@ -371,15 +371,7 @@ list(APPEND SOURCE_FILES
|
||||||
displayapp/screens/StopWatch.cpp
|
displayapp/screens/StopWatch.cpp
|
||||||
displayapp/screens/BatteryIcon.cpp
|
displayapp/screens/BatteryIcon.cpp
|
||||||
displayapp/screens/BleIcon.cpp
|
displayapp/screens/BleIcon.cpp
|
||||||
<<<<<<< HEAD
|
|
||||||
<<<<<<< HEAD
|
|
||||||
displayapp/screens/AlarmIcon.cpp
|
|
||||||
=======
|
|
||||||
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/NotificationIcon.cpp
|
||||||
displayapp/screens/SystemInfo.cpp
|
displayapp/screens/SystemInfo.cpp
|
||||||
displayapp/screens/Label.cpp
|
displayapp/screens/Label.cpp
|
||||||
|
|
Loading…
Reference in a new issue