summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclimbalima <climbalima@users.noreply.github.com>2016-11-16 20:44:49 -0500
committerGitHub <noreply@github.com>2016-11-16 20:44:49 -0500
commitb085a34506bc981a7c7cdb270b7786d6a4cbf985 (patch)
tree1baa4005ba9c498744a3bbb2257943dbd41036e0
parent21b6b4e6c4d6872164a13e8d31e3e0a9f146ea60 (diff)
fixed readme conflicts
-rw-r--r--keyboards/maxipad/readme.md22
1 files changed, 2 insertions, 20 deletions
diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md
index 1971ce1f36..ab7b122fe8 100644
--- a/keyboards/maxipad/readme.md
+++ b/keyboards/maxipad/readme.md
@@ -1,13 +1,7 @@
-maxipad keyboard firmware
-======================
-
## Quantum MK Firmware
-<<<<<<< HEAD
For the full Quantum feature list, see [the parent readme](/).
-=======
-For the full Quantum feature list, see [the parent readme.md](/doc/readme.md).
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+
## Building
@@ -17,17 +11,13 @@ Depending on which keymap you would like to use, you will have to compile slight
### Default
-<<<<<<< HEAD
-To build with the default keymap, simply run `make default`.
-=======
To build with the default keymap, simply run `make`.
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+
### Other Keymaps
Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files.
-<<<<<<< HEAD
To build the firmware binary hex file with a keymap just do `make` with a keymap like this:
```
@@ -35,12 +25,4 @@ $ make [default|jack|<name>]
```
Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
-=======
-To build the firmware binary hex file with a keymap just do `make` with `keymap` option like:
-
-```
-$ make keymap=[default|jack|<name>]
-```
-Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/`
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df