Merge branch 'master' of github.com:dragon788/qmk_firmware_ez

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c

diff --cc keyboard/ergodox_ez/keymaps/keymap_default.c
index 762e118b054bf45795552dd7a9ca1fa76a23e52a,9beadf12f331056ecbb668178ec0a7e978a69eee..b2a318b9873041c519a1fafbf68843bf7dfc4339
--- 1/keyboard/ergodox_ez/keymaps/keymap_default.c
--- 2/keyboard/ergodox_ez/keymaps/keymap_default.c
+++ b/keyboard/ergodox_ez/keymaps/keymap_default.c
@@@ -119,10 -120,10 +119,10 @@@ KEYMAP
         KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 -       KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN3, KC_BTN2,
 +       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
                                             KC_TRNS, KC_TRNS,
                                                      KC_TRNS,
-                                   KC_TRNS, KC_TRNS, KC_TRNS,
+                                   KC_BTN1, KC_BTN2, KC_TRNS,
      // right hand
         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,