Merge branch 'minidox' of https://github.com/That-Canadian/qmk_firmware into minidox

8 years ago · e2e0f5d6d1
parent 21b63d9243 a4958a532d
commit e2e0f5d6d1
1 changed files with 4 additions and 0 deletions
--- 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|------+------.
 *                                |      |    |      |
 *                                `------'    `------'