diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
| commit | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (patch) | |
| tree | 7ac943fb1ba4f430a7220efd18f66f6a77205c30 /keyboards/keychron/k6_pro/ansi | |
| parent | e736133392fe6427cfb995da0787337189828272 (diff) | |
| parent | 2709b6ed616f8012ff4cfd3ee69a822a8d188351 (diff) | |
Merge upstream master
Diffstat (limited to 'keyboards/keychron/k6_pro/ansi')
| -rw-r--r-- | keyboards/keychron/k6_pro/ansi/rgb/info.json | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/keyboards/keychron/k6_pro/ansi/rgb/info.json b/keyboards/keychron/k6_pro/ansi/rgb/info.json index b82f749c08..2167da9ef7 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k6_pro/ansi/rgb/info.json @@ -3,9 +3,15 @@ "url": "https://github.com/Keychron", "maintainer": "lokher", "usb": { +<<<<<<< HEAD:keyboards/keychron/k6_pro/ansi/rgb/info.json "vid": "0x3434", "pid": "0x0260", "device_version": "1.0.0" +======= + "vid": "0x7516", + "pid": "0x7001", + "device_version": "0.0.1" +>>>>>>> master:keyboards/horrortroll/chinese_pcb/devil68_pro/info.json }, "layouts": { "LAYOUT_ansi_68": { |