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.

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

matrix_init_user shouldn't call itself #5298

Merged
merged 1 commit into from
Mar 3, 2019
Merged

matrix_init_user shouldn't call itself #5298

merged 1 commit into from
Mar 3, 2019

Conversation

rayslinky
Copy link
Contributor

Description

Inadvertent extra line in previous commit.

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).

@drashna
Copy link
Member

drashna commented Mar 3, 2019

Whoops, that would be a problem!

Thanks!

@drashna drashna merged commit 9b0a548 into qmk:master Mar 3, 2019
@rayslinky rayslinky deleted the patch-1 branch March 3, 2019 18:55
bl1nk added a commit to bl1nk/qmk_firmware that referenced this pull request Mar 3, 2019
* upstream/master: (58 commits)
  [Keymap] layout/community/ortho4x12/symbolic update (qmk#5274)
  [Keyboard] matrix_init_user shouldn't call itself (qmk#5298)
  [Keymap] Update keymap.c (qmk#5290)
  Update Atreus layout to match the Niu layout. Fix Niu comment typo. (qmk#5297)
  [Keymap] Fix comment in the KBD67 default keymap. (qmk#5296)
  [Keyboard] update Hecomi/alpha's info.json  (qmk#5295)
  [Keyboard] Adding Numeric Keypad //e converter (qmk#5294)
  [Keyboard] Add support for matrix_scan_user to usb-usb converter (qmk#5291)
  handwired/terminus_mini: refactor, Configurator support, and readme cleanup (qmk#5292)
  [Keyboard] Initial commit for Prime_E w/ VIA config support (qmk#5285)
  [Keyboard] add dz60rgb ansi and hhkb support; add dz40rgb (qmk#5231)
  [Keyboard] Convert mf68_ble to keymap (qmk#5287)
  [Keymap] Added INSERT to my keymaps (qmk#5284)
  HS60 v2: Instructions how to reset and flash (qmk#5241)
  [Keymap] unausgeschlafen quefrency keymap (qmk#5273)
  [Keymap] Fix rgblight_enable ifdefs (qmk#5283)
  [Keymap] DCompact Layout Updates pt. 3 (qmk#5209)
  [Keyboard] Add Dozen0 (qmk#5272)
  [Keymap] update: add extrakey support for macOS media keys (qmk#5263)
  [Keymap] My TMO50 layout (qmk#5116)
  ...
slugger7 pushed a commit to slugger7/qmk_firmware that referenced this pull request Mar 7, 2019
chie4hao pushed a commit to chie4hao/qmk_firmware that referenced this pull request Mar 28, 2019
zer09 pushed a commit to zer09/qmk_firmware that referenced this pull request Mar 31, 2019
slugger7 pushed a commit to slugger7/qmk_firmware that referenced this pull request Apr 3, 2019
dlhextall pushed a commit to dlhextall/qmk_firmware that referenced this pull request May 24, 2019
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants