Merge remote-tracking branch 'origin/master' into develop

4 years ago · 968a3b324b
parent 8e8ec6338c fd4759dcfa
commit 968a3b324b
2 changed files with 2 additions and 2 deletions
--- a/keyboards/ocean/gin_v2/keymaps/default/keymap.c
+++ b/keyboards/ocean/gin_v2/keymaps/default/keymap.c
@ -14,8 +14,8 @@
 */
 #include QMK_KEYBOARD_H

+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  {
  [0] = LAYOUT(
    KC_P7, KC_P8, KC_P9,      KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSPC,
    KC_P4, KC_P5, KC_P6,      KC_TAB,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT,
--- a/keyboards/ocean/gin_v2/keymaps/via/keymap.c
+++ b/keyboards/ocean/gin_v2/keymaps/via/keymap.c
@ -14,8 +14,8 @@
 */
 #include QMK_KEYBOARD_H

+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  {
  [0] = LAYOUT(
    KC_P7, KC_P8, KC_P9,      KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, KC_BSPC,
    KC_P4, KC_P5, KC_P6,      KC_TAB,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT,