diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-11 09:48:25 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-11 09:48:25 -0700 |
| commit | 345f6dc4e6910ab11907dfa5382edb12d57a1d7b (patch) | |
| tree | b57d00ab7fe59a47f4035ab7463dec5090ef6464 /keyboards/yatara/drink_me | |
| parent | f4c447f2dfd9146664e3e985cac743abf17ac060 (diff) | |
| parent | 02ac0f89c4665f5fc6e57559a8c49d363117fbc0 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:
- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
- Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
- Conflict from PR 13947
Diffstat (limited to 'keyboards/yatara/drink_me')
| -rw-r--r-- | keyboards/yatara/drink_me/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/yatara/drink_me/config.h b/keyboards/yatara/drink_me/config.h index ab066761fd..10573092c9 100644 --- a/keyboards/yatara/drink_me/config.h +++ b/keyboards/yatara/drink_me/config.h @@ -19,7 +19,7 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x5961 // "Ya" - Yatara #define PRODUCT_ID 0x1470 #define DEVICE_VER 0x0001 #define MANUFACTURER Yatara |