From b085a34506bc981a7c7cdb270b7786d6a4cbf985 Mon Sep 17 00:00:00 2001
From: climbalima <climbalima@users.noreply.github.com>
Date: Wed, 16 Nov 2016 20:44:49 -0500
Subject: [PATCH 1/2] fixed readme conflicts

---
 keyboards/maxipad/readme.md | 22 ++--------------------
 1 file 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

From a06115df19a74d39b08758472b221e630c3680d3 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Fri, 18 Nov 2016 23:20:07 -0500
Subject: [PATCH 2/2] don't always detect a matrix change (fixes debounce)

---
 quantum/matrix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/matrix.c b/quantum/matrix.c
index 3c488b417d..07eb87bc36 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -310,7 +310,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
     // Unselect row
     unselect_row(current_row);
 
-    return (last_row_value == current_matrix[current_row]);
+    return (last_row_value != current_matrix[current_row]);
 }
 
 static void select_row(uint8_t row)