resolved conflicts
[jackhill/qmk/firmware.git] / keyboards / emptystring /
drwxr-xr-x   ..
drwxr-xr-x - NQG