Merge branch 'minidox' of https://github.com/That-Canadian/qmk_firmware into minidox
This commit is contained in:
commit
e2e0f5d6d1
@ -40,7 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||||||
* | Z | X | C | V | B | | N | M | , | . | / |
|
* | Z | X | C | V | B | | N | M | , | . | / |
|
||||||
* `----------------------------------' `----------------------------------'
|
* `----------------------------------' `----------------------------------'
|
||||||
* ,--------------------. ,------,-------------.
|
* ,--------------------. ,------,-------------.
|
||||||
|
<<<<<<< HEAD
|
||||||
* | Shift| LOWER| | | | RAISE| Ctrl |
|
* | Shift| LOWER| | | | RAISE| Ctrl |
|
||||||
|
=======
|
||||||
|
* | Ctrl | LOWER| | | | RAISE| Shift|
|
||||||
|
>>>>>>> a4958a532da154b9dd6f6144836a73f9de641f74
|
||||||
* `-------------| Space| |BckSpc|------+------.
|
* `-------------| Space| |BckSpc|------+------.
|
||||||
* | | | |
|
* | | | |
|
||||||
* `------' `------'
|
* `------' `------'
|
||||||
|
Loading…
Reference in New Issue
Block a user