climbalima 21b6b4e6c4 should have fixed conflixed 9 年之前
..
Makefile 1dd6ceb45d Updated my repo to current qmk 9 年之前
config.h 21b6b4e6c4 should have fixed conflixed 9 年之前
rev2.c 21b6b4e6c4 should have fixed conflixed 9 年之前
rev2.h 21b6b4e6c4 should have fixed conflixed 9 年之前
rules.mk 1dd6ceb45d Updated my repo to current qmk 9 年之前