summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua T <joshua@sonofone.net>2016-07-15 17:44:39 -0500
committerJoshua T <joshua@sonofone.net>2016-07-15 17:44:39 -0500
commit77377e2784705a6d31b81dc1a855201ff26700dc (patch)
treec64a93006f67b18b6c3c303924699ebb03080435
parent42843d9b62f2f1707004ce677fe2ce1be485a11f (diff)
Fixed a merge conflict
-rw-r--r--keyboards/atreus/keymaps/replicaJunction/keymap.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/keyboards/atreus/keymaps/replicaJunction/keymap.c b/keyboards/atreus/keymaps/replicaJunction/keymap.c
index 992eabdbdb..f2a8ff24c1 100644
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-#include "atreus.h"
-
/*
* Keyboard: Atreus
* Keymap: replicaJunction
@@ -17,12 +14,6 @@
* 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.