diff options
| author | Zach White <skullydazed@gmail.com> | 2021-07-14 10:30:28 -0700 |
|---|---|---|
| committer | Zach White <skullydazed@gmail.com> | 2021-07-14 10:30:28 -0700 |
| commit | 44d322623eb875f6eb2e0a317c76af2d47f7a9dc (patch) | |
| tree | ab722bcc4cea4e4ed16f0a5dce0602fe1f2c63e5 /keyboards/handwired/marauder/readme.md | |
| parent | 52cfc9259b58a3a11a244fbe35c49c7dd1a9cae0 (diff) | |
| parent | ffdfe3798bc7bd374991abe8f10494f2e73aedd5 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
keyboards/checkerboards/nop60/info.json
Diffstat (limited to 'keyboards/handwired/marauder/readme.md')
| -rw-r--r-- | keyboards/handwired/marauder/readme.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/handwired/marauder/readme.md b/keyboards/handwired/marauder/readme.md index 1a0150159f..914aaab078 100644 --- a/keyboards/handwired/marauder/readme.md +++ b/keyboards/handwired/marauder/readme.md @@ -1,10 +1,10 @@ # Marauder -90% hand-wired mechanical keyboard in an old Razer case; built around an Elite-C v3.1 controller. +90% hand-wired mechanical keyboard in an old Razer case; built around an Elite-C v3.1 controller. Features a 128x32 OLED screen and RGB. [Build Log](https://imgur.com/a/TvsXpq5) -* Keyboard Maintainer: [%YOUR_NAME%](https://github.com/BB-66) +* Keyboard Maintainer: [BB-66](https://github.com/BB-66) * Hardware Supported: Elite-C, Razer Marauder Make example for this keyboard (after setting up your build environment): |