climbalima 21b6b4e6c4 should have fixed conflixed

2016-11-16 19:49:38 -05:00

..

config.h

should have fixed conflixed

2016-11-16 19:49:38 -05:00

Makefile

Updated my repo to current qmk

2016-11-16 19:18:54 -05:00

rev1.c

should have fixed conflixed

2016-11-16 19:49:38 -05:00

rev1.h

should have fixed conflixed

2016-11-16 19:49:38 -05:00

rules.mk

Updated my repo to current qmk

2016-11-16 19:18:54 -05:00