Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6343cb5a authored by Chris Wren's avatar Chris Wren
Browse files

resolve merge conflicts of 18455a91 to master

Change-Id: I06da8fa1601633baad82be50ae881462d33ff27e
parents 91b43d50 18455a91
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -2256,6 +2256,8 @@ message MetricsEvent {
    // CATEGORY: SETTINGS
    SETTINGS_GESTURES = 459;

    // ---- End N-MR1 Constants, all N-MR1 constants go above this line ----

    // ------- Begin N Keyboard Shortcuts Helper -----
    // Keyboard Shortcuts Helper is opened/closed.
    KEYBOARD_SHORTCUTS_HELPER = 460;