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

Process info.json rules ahead of userspace rules #11542

Merged
merged 1 commit into from
Jan 14, 2021
Merged

Process info.json rules ahead of userspace rules #11542

merged 1 commit into from
Jan 14, 2021

Conversation

skullydazed
Copy link
Member

Description

Fixes the import order so that keyboard-level vars don't overwrite userspace.

Types of Changes

  • Core
  • Bugfix

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • I have read the CONTRIBUTING document.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added the core label Jan 13, 2021
@skullydazed
Copy link
Member Author

Thanks to @spidey3 for the bug report and testing.

@skullydazed skullydazed requested a review from a team January 13, 2021 21:02
@spidey3
Copy link
Contributor

spidey3 commented Jan 13, 2021

I have tested this change and it does seem to work as intended.

drashna
drashna approved these changes Jan 13, 2021
View reviewed changes
Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@skullydazed skullydazed merged commit 3c8da5e into develop Jan 14, 2021
@skullydazed skullydazed deleted the fix_rules branch January 14, 2021 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spidey3 spidey3 spidey3 approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
core
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@skullydazed @spidey3 @drashna