summaryrefslogtreecommitdiffstats
path: root/keyboards/atreus/keymaps
diff options
context:
space:
mode:
authorJoshua T <joshua@sonofone.net>2016-07-13 22:41:02 -0500
committerJoshua T <joshua@sonofone.net>2016-07-13 22:41:02 -0500
commit92e7291ad7c16adb9eee182b7ddddff5bd5683c6 (patch)
tree5aa7806b6bb02f1e2afe077f22012be22b153c86 /keyboards/atreus/keymaps
parentf90d89458c9ff8e33f1739c06681f28ffd95b5f9 (diff)
parent32725dae5ba50f41bf16a80083727f08beaea7c6 (diff)
Corrected merge conflict
Diffstat (limited to 'keyboards/atreus/keymaps')
-rw-r--r--keyboards/atreus/keymaps/replicaJunction/keymap.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 79b2738aa3..992eabdbdb 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
#include "atreus.h"
/*
@@ -16,6 +17,12 @@
* The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found
* here: https://colemakmods.github.io/mod-dh/
*/
+=======
+// this is the style you want to emulate.
+// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
+
+#include "atreus.h"
+>>>>>>> 32725dae5ba50f41bf16a80083727f08beaea7c6
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.