Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix up merlin's 65 ansi blocker layout #8099

Merged
merged 1 commit into from
Feb 5, 2020
Merged

Fix up merlin's 65 ansi blocker layout #8099

merged 1 commit into from
Feb 5, 2020

Conversation

mechmerlin
Copy link
Contributor

@mechmerlin mechmerlin commented Feb 5, 2020 •
edited
Loading

Description

Noticed I had an extra comma, when trying to compile these changes

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@mechmerlin mechmerlin added the bug label Feb 5, 2020
@mechmerlin mechmerlin mentioned this pull request Feb 5, 2020
Merged
13 tasks
@drashna drashna requested a review from a team February 5, 2020 18:26
@zvecr zvecr added the keymap label Feb 5, 2020
@zvecr zvecr merged commit ae7b208 into qmk:master Feb 5, 2020
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Feb 7, 2020
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
1bc1ccb 
* 'master' of https://github.com/qmk/qmk_firmware:
  [Keyboard] adding keyboard: tkl30 (qmk#7979)
  Move Grave Escape, Lock and Leader keycodes into their own sect… (qmk#8093)
  Committing fix to info.json for wsk/jerkin (qmk#8110)
  Use function for KEYCODE2 routines instead of macro. (qmk#8101)
  [keyboard] adding keyboard: jerkin (qmk#7975)
  Ergosaurus Configurator support bugfix (qmk#8104)
  Xelus Dawn60: layout macro update and Configurator layout support (qmk#8102)
  VIA Support: 1upkeyboards 1up60rgb (qmk#8097)
  [Keymap] User keymap for AKB/Raine (qmk#8081)
  VIA Support: KBD67 mkii v1/v2 (qmk#8085)
  fixup keymap for 65_ansi_blocker (qmk#8099)
  [Keyboard] manta60 (qmk#8068)
  [Keyboard] add Infinity CE (qmk#8067)
  [Keyboard] Added Atreus Pro Micro variant (qmk#8059)
  Add Uni660 Keyboard (qmk#8018)
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
@mechmerlin @HokieGeek
fixup keymap for 65_ansi_blocker (qmk#8099)
2fe2a70
c0psrul3 pushed a commit to c0psrul3/qmk_firmware that referenced this pull request Mar 23, 2020
@mechmerlin @c0psrul3
fixup keymap for 65_ansi_blocker (qmk#8099)
633ac5c
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
@mechmerlin @kujawakk
fixup keymap for 65_ansi_blocker (qmk#8099)
d511c6e
@mechmerlin mechmerlin deleted the feature/merlin_blockerfix branch May 17, 2020 22:07
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
@mechmerlin
fixup keymap for 65_ansi_blocker (qmk#8099)
6181cd7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zvecr zvecr zvecr approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
bug keymap
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mechmerlin @drashna @zvecr