diff options
| author | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
|---|---|---|
| committer | Mark Russell <mruss660@gmail.com> | 2021-09-16 16:20:39 -0400 |
| commit | b9e56843a29672b2befa65bf036f6db21078291f (patch) | |
| tree | c2fa91e352127c09abd0f9b4959cd1f47d628ea8 /src/displayapp/Messages.h | |
| parent | cdf99b08f42c3826a8608d756bc7cda0a476ed98 (diff) | |
| parent | 3eb73774a39e255cd4b5de76441a59f1525a989c (diff) | |
resolve conflict in src/systemtask/Messages.h
Diffstat (limited to 'src/displayapp/Messages.h')
| -rw-r--r-- | src/displayapp/Messages.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h index c23cdfe3..d48b646f 100644 --- a/src/displayapp/Messages.h +++ b/src/displayapp/Messages.h @@ -7,7 +7,6 @@ namespace Pinetime { GoToRunning, UpdateDateTime, UpdateBleConnection, - UpdateBatteryLevel, TouchEvent, ButtonPushed, NewNotification, |