resolve conflict in src/systemtask/Messages.h

This commit is contained in:
Mark Russell
2021-09-16 16:20:39 -04:00
33 changed files with 300 additions and 232 deletions

View File

@@ -22,7 +22,9 @@ namespace Pinetime {
OnNewDay,
OnChargingEvent,
SetOffAlarm,
StopRinging
StopRinging,
MeasureBatteryTimerExpired,
BatteryMeasurementDone,
};
}
}