From: Joshua T <joshua@sonofone.net>
Date: Thu, 14 Jul 2016 03:41:02 +0000 (-0500)
Subject: Corrected merge conflict
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=92e7291ad7c16adb9eee182b7ddddff5bd5683c6;p=qmk_firmware.git

Corrected merge conflict
---

92e7291ad7c16adb9eee182b7ddddff5bd5683c6
diff --cc keyboards/atreus/keymaps/replicaJunction/keymap.c
index 79b2738aa,7ff8933e8..992eabdbd
--- a/keyboards/atreus/keymaps/replicaJunction/keymap.c
+++ b/keyboards/atreus/keymaps/replicaJunction/keymap.c
@@@ -1,21 -1,7 +1,28 @@@
++<<<<<<< HEAD
 +#include "atreus.h"
 +
 +/*
 + * Keyboard: Atreus
 + * Keymap:   replicaJunction
 + * Version:  0.1
 + *
 + * This keymap is designed to complement my Ergodox keyboard layout, found in keyboards/ergodox_ez.
 + * The Atreus keyboard is a 40% board whose design was heavily influenced by the Ergodox, and I now
 + * have both keyboards, so I've designed these layouts in an effort to make switching between the
 + * two as easy as possible.
 + *
 + * Clearly, the Atreus is the limiting factor in this equation, so I've taken heavy advantage of
 + * function and dual-role keys.
 + *
 + * 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.