resolves conflicts

2022-01-02 22:27:43 +00:00
parent 94561b2331 e0013e7304
commit cc259b6a4a
236 changed files with 4120 additions and 1555 deletions
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstdint>
 namespace Pinetime {
  namespace Applications {
    namespace Display {
@@ -9,6 +10,9 @@ namespace Pinetime {
        UpdateBleConnection,
        TouchEvent,
        ButtonPushed,
+        ButtonLongPressed,
+        ButtonLongerPressed,
+        ButtonDoubleClicked,
        NewNotification,
        TimerDone,
        BleFirmwareUpdateStarted,