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

diff --cc keyboards/minidox/keymaps/that_canadian/keymap.c
index bc4e66fd863dc38460faa59c2495955330a22f6f,da9905346ea2f5201c798395e9143f0c7e58a683..5d55d182513a31a071a144a63042e50acf183c59
--- 1/keyboards/minidox/keymaps/that_canadian/keymap.c
--- 2/keyboards/minidox/keymaps/that_canadian/keymap.c
+++ b/keyboards/minidox/keymaps/that_canadian/keymap.c
@@@ -40,7 -40,7 +40,11 @@@ const uint16_t PROGMEM keymaps[][MATRIX
   * |   Z  |   X  |   C  |   V  |   B  |           |   N  |   M  |   ,  |   .  |   /  |
   * `----------------------------------'           `----------------------------------'
   *                  ,--------------------.    ,------,-------------.
++<<<<<<< HEAD
 + *                  | Shift| LOWER|      |    |      | RAISE| Ctrl |
++=======
+  *                  | Ctrl | LOWER|      |    |      | RAISE| Shift|
++>>>>>>> a4958a532da154b9dd6f6144836a73f9de641f74
   *                  `-------------| Space|    |BckSpc|------+------.
   *                                |      |    |      |
   *                                `------'    `------'