diff options
author | QMK Bot <hello@qmk.fm> | 2021-04-20 17:23:01 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-04-20 17:23:01 +0000 |
commit | 120b15458ca70f06880f5f168bc0b914a72d0efa (patch) | |
tree | f22200b4814e480024aa852ab042f417b23c9394 /keyboards | |
parent | 19887f2d35a280ae262fc5743060444f4bb5068c (diff) | |
parent | 54bad99e0e94060edfad16e0a293e5feac2a478e (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/merge/iso_macro/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h index 5ad63c134d..05ca6f05f7 100644 --- a/keyboards/merge/iso_macro/config.h +++ b/keyboards/merge/iso_macro/config.h @@ -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 |