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

This commit is contained in:
QMK Bot 2021-04-20 17:23:01 +00:00
commit 120b15458c

View file

@ -18,7 +18,7 @@
#include "config_common.h"
#define VENDOR_ID 0xFEED
#define VENDOR_ID 0x4D65
#define PRODUCT_ID 0x1200
#define DEVICE_VER 0x0001
#define MANUFACTURER Merge