diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-19 11:32:23 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-19 11:32:23 -0700 |
| commit | 4279b14adffe081a3dfb17fa0f04ed21513e5eda (patch) | |
| tree | 770bd82b05595b686ad8cfdce79ea7f8439bda83 /keyboards/acheron | |
| parent | 9d1c98c891bb8e1e98dc618e0693a7efff23a22e (diff) | |
| parent | f4f679779e1404d9dc34c64823b9eb993bfa7ab3 (diff) | |
| download | qmk_firmware-4279b14adffe081a3dfb17fa0f04ed21513e5eda.tar.gz qmk_firmware-4279b14adffe081a3dfb17fa0f04ed21513e5eda.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
keyboards/space_space/rules.mk
Diffstat (limited to 'keyboards/acheron')
| -rw-r--r-- | keyboards/acheron/shark/keymaps/ajp10304/readme.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keyboards/acheron/shark/keymaps/ajp10304/readme.md b/keyboards/acheron/shark/keymaps/ajp10304/readme.md index 73e5b831e..c17232162 100644 --- a/keyboards/acheron/shark/keymaps/ajp10304/readme.md +++ b/keyboards/acheron/shark/keymaps/ajp10304/readme.md | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # AJP10304 Custom Shark Layout | 1 | # AJP10304 Custom Shark Layout |
| 2 | # Also available for the Planck, JJ40 and Atreus50 | 2 | # Also available for the Planck, Quark, JJ40 and Atreus50 |
| 3 | 3 | ||
| 4 | **Note:** In the tables below where there are two characters on a key, | 4 | **Note:** In the tables below where there are two characters on a key, |
| 5 | the second is the output when shift is applied. | 5 | the second is the output when shift is applied. |