drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

should have fixed conflixed

Browse source
This commit is contained in:
climbalima 2016-11-16 19:49:38 -05:00
parent 668c739702
commit 21b6b4e6c4
13 changed files with 10 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

9
keyboards/maxipad/config.h
View file

@ -24,15 +24,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
<<<<<<< HEAD
#define MANUFACTURER You
#define PRODUCT maxipad
#define DESCRIPTION A custom keyboard
=======
#define MANUFACTURER Wootpatoot
#define PRODUCT maxipad
#define DESCRIPTION g8ming keeb
>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
#define DESCRIPTION A custom keyboard
/* key matrix size */
#define MATRIX_ROWS 5