From: dragon788 <dragon788@users.noreply.github.com>
Date: Mon, 28 Dec 2015 20:44:49 +0000 (-0600)
Subject: Merge branch 'master' of github.com:jackhumbert/qmk_firmware
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d1f8d0104bd35bb7e812490f474fab3a9aba8fcb;p=qmk_firmware.git

Merge branch 'master' of github.com:jackhumbert/qmk_firmware

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
---

d1f8d0104bd35bb7e812490f474fab3a9aba8fcb
diff --cc keyboard/ergodox_ez/keymaps/keymap_default.c
index 9beadf12f,762e118b0..b2a318b98
--- a/keyboard/ergodox_ez/keymaps/keymap_default.c
+++ b/keyboard/ergodox_ez/keymaps/keymap_default.c
@@@ -120,10 -119,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,