diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-07-14 22:04:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 22:04:18 -0400 |
| commit | 7c0610b4117b17b24f9a53c0f9d237175a4a3d25 (patch) | |
| tree | 0bf188370d603eeab2d872cf376b8a3e19c664c5 /keyboards/minidox/keymaps/that_canadian/keymap.c | |
| parent | 6ed8ce4f598f838b971aa290a499f852827e1b58 (diff) | |
| parent | b6d74b9bb90303f11796b8ccf8b98e2f532351ac (diff) | |
Merge pull request #1498 from That-Canadian/minidox
Minidox
Diffstat (limited to 'keyboards/minidox/keymaps/that_canadian/keymap.c')
| -rw-r--r-- | keyboards/minidox/keymaps/that_canadian/keymap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/keyboards/minidox/keymaps/that_canadian/keymap.c b/keyboards/minidox/keymaps/that_canadian/keymap.c index da9905346e..5d55d18251 100644 --- a/keyboards/minidox/keymaps/that_canadian/keymap.c +++ b/keyboards/minidox/keymaps/that_canadian/keymap.c @@ -40,7 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Z | X | C | V | B | | N | M | , | . | / | * `----------------------------------' `----------------------------------' * ,--------------------. ,------,-------------. +<<<<<<< HEAD + * | Shift| LOWER| | | | RAISE| Ctrl | +======= * | Ctrl | LOWER| | | | RAISE| Shift| +>>>>>>> a4958a532da154b9dd6f6144836a73f9de641f74 * `-------------| Space| |BckSpc|------+------. * | | | | * `------' `------' @@ -49,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ - KC_LCTL, LOWER, KC_SPC, KC_BSPC, RAISE, OSM(MOD_LSFT) \ + OSM(MOD_LSFT), LOWER, KC_SPC, KC_BSPC, RAISE, KC_LCTL \ ), /* Raise |