resolved conflicts
[jackhill/qmk/firmware.git] / keyboards / wilba_tech / wt60_a /
drwxr-xr-x   ..
-rw-r--r-- 6452 config.h
-rw-r--r-- 4500 info.json
drwxr-xr-x - keymaps
-rw-r--r-- 812 readme.md
-rw-r--r-- 2902 rules.mk
-rw-r--r-- 737 wt60_a.c
-rw-r--r-- 2704 wt60_a.h