summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/minidox/keymaps/that_canadian/keymap.c4
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 bc4e66fd8..5d55d1825 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|------+------.
* | | | |
* `------' `------'