localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

Fixed a merge conflict

This commit is contained in:
Joshua T 2016-07-15 17:44:39 -05:00
parent 42843d9b62
commit 77377e2784
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
keyboards/atreus/keymaps/replicaJunction/keymap.c
View File

@ -1,6 +1,3 @@
<<<<<<< HEAD
#include "atreus.h"
/* /*
* Keyboard: Atreus * Keyboard: Atreus
* Keymap: replicaJunction * Keymap: replicaJunction
@ -17,12 +14,6 @@
* The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found * The default key layout in this keymap is Colemak-ModDH. Information on that layout can be found
* here: https://colemakmods.github.io/mod-dh/ * 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. // 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. // The underscores don't mean anything - you can have a layer called STUFF or any other name.