diff options
| author | That-Canadian <poole.chris.11@gmail.com> | 2017-07-14 21:33:19 -0400 |
|---|---|---|
| committer | That-Canadian <poole.chris.11@gmail.com> | 2017-07-14 21:33:19 -0400 |
| commit | e2e0f5d6d13f6e4d2528ee9ff5e48f896d637092 (patch) | |
| tree | 4cb504ff38d102469b5b0e0ac01ef6146553c9b1 /keyboards | |
| parent | 21b63d924327ac404b8592d3c07b3695eb3e235f (diff) | |
| parent | a4958a532da154b9dd6f6144836a73f9de641f74 (diff) | |
Merge branch 'minidox' of https://github.com/That-Canadian/qmk_firmware into minidox
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/minidox/keymaps/that_canadian/keymap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keyboards/minidox/keymaps/that_canadian/keymap.c b/keyboards/minidox/keymaps/that_canadian/keymap.c index bc4e66fd86..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|------+------. * | | | | * `------' `------' |