resolves conflicts

2022-01-02 22:27:43 +00:00
parent 94561b2331 e0013e7304
commit cc259b6a4a
236 changed files with 4120 additions and 1555 deletions
@@ -15,7 +15,8 @@ namespace Pinetime {
        BleFirmwareUpdateStarted,
        BleFirmwareUpdateFinished,
        OnTouchEvent,
-        OnButtonEvent,
+        HandleButtonEvent,
+        HandleButtonTimerEvent,
        OnDisplayTaskSleeping,
        EnableSleeping,
        DisableSleeping,
@@ -23,10 +24,13 @@ namespace Pinetime {
        OnNewHour,
        OnNewHalfHour,
        OnChargingEvent,
+        OnPairing,
        SetOffAlarm,
        StopRinging,
        MeasureBatteryTimerExpired,
        BatteryPercentageUpdated,
+        StartFileTransfer,
+        StopFileTransfer,
      };
    }
 }