Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 13 insertions, 13 deletions

diff --git a/keyboards/four_banger/keymaps/default/keymap.c b/keyboards/four_banger/keymaps/default/keymap.c
index 6c5f7c8a55..3fea0afd4f 100644
--- a/keyboards/four_banger/keymaps/default/keymap.c
+++ b/keyboards/four_banger/keymaps/default/keymap.c
@@ -5,20 +5,20 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT_ortho_2x2(
-        KC_1, KC_U,
-        KC_P, UP_URL
-    ),
+  LAYOUT_ortho_2x2(
+    KC_1, KC_U,
+    KC_P, UP_URL
+  ),
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case UP_URL:
-            if (record->event.pressed) {
-                SEND_STRING("http://1upkeyboards.com");
-            }
-            return false;
-            break;
-    }
-    return true;
+  switch (keycode) {
+    case UP_URL:
+      if (record->event.pressed) {
+        SEND_STRING("http://1upkeyboards.com");
+      }
+      return false;
+      break;
+  }
+  return true;
 }