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

2 files changed, 25 insertions, 25 deletions

diff --git a/keyboards/launchpad/keymaps/default/keymap.c b/keyboards/launchpad/keymaps/default/keymap.c
index 560f7e8585..62dee131f8 100644
--- a/keyboards/launchpad/keymaps/default/keymap.c
+++ b/keyboards/launchpad/keymaps/default/keymap.c
@@ -27,11 +27,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | FUNC |  8   |
  * `-------------'
  */
-[_QWERTY] = LAYOUT( \
-    KC_1,      KC_2, \
-    KC_3,      KC_4, \
-    KC_5,      KC_6, \
-    MO(_FUNC), KC_8  \
+[_QWERTY] = LAYOUT(
+    KC_1,      KC_2,
+    KC_3,      KC_4,
+    KC_5,      KC_6,
+    MO(_FUNC), KC_8
 ),
 
 /* Function
@@ -45,11 +45,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |  C   |
  * `-------------'
  */
-[_FUNC] = LAYOUT( \
-    KC_Q,    CALTDEL, \
-    KC_A,    TSKMGR, \
-    KC_Z,    KC_X, \
-    _______, KC_C \
+[_FUNC] = LAYOUT(
+    KC_Q,    CALTDEL,
+    KC_A,    TSKMGR,
+    KC_Z,    KC_X,
+    _______, KC_C
 )
 
 };
diff --git a/keyboards/launchpad/keymaps/default_rgb/keymap.c b/keyboards/launchpad/keymaps/default_rgb/keymap.c
index 50fef532c0..529fa91f65 100644
--- a/keyboards/launchpad/keymaps/default_rgb/keymap.c
+++ b/keyboards/launchpad/keymaps/default_rgb/keymap.c
@@ -28,11 +28,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * | FUNC | RGB  |
      * `-------------'
      */
-    [_QWERTY] = LAYOUT( \
-        KC_1,      KC_2, \
-        KC_3,      KC_4, \
-        KC_5,      KC_6, \
-        MO(_FUNC), TG(_RGB) \
+    [_QWERTY] = LAYOUT(
+        KC_1,      KC_2,
+        KC_3,      KC_4,
+        KC_5,      KC_6,
+        MO(_FUNC), TG(_RGB)
       ),
 
     /* RGB
@@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |RGBTOG|      |
      * `-------------'
      */
-    [_RGB] = LAYOUT( \
-        RGB_RMOD, RGB_MOD, \
-        RGB_HUD,  RGB_HUI, \
-        RGB_SAD,  RGB_SAI, \
-        RGB_TOG,  KC_TRNS \
+    [_RGB] = LAYOUT(
+        RGB_RMOD, RGB_MOD,
+        RGB_HUD,  RGB_HUI,
+        RGB_SAD,  RGB_SAI,
+        RGB_TOG,  KC_TRNS
       ),
 
     /* Function
@@ -64,11 +64,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |      |  C   |
      * `-------------'
      */
-    [_FUNC] = LAYOUT( \
-        KC_Q,    CALTDEL, \
-        KC_A,    TSKMGR, \
-        KC_Z,    KC_X, \
-        _______, KC_C \
+    [_FUNC] = LAYOUT(
+        KC_Q,    CALTDEL,
+        KC_A,    TSKMGR,
+        KC_Z,    KC_X,
+        _______, KC_C
       )
 
 };