Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot
2021-01-20 01:42:07 +00:00
78 changed files with 0 additions and 82 deletions
@@ -8,8 +8,6 @@
#define MANUFACTURER meagerfindings
#undef PRODUCT
#define PRODUCT ErgoDox
#undef DESCRIPTION
#define DESCRIPTION meagerfindings firmware for Ergodox
#define USB_MAX_POWER_CONSUMPTION 500