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

Bugfix for Jacky Studio keyboards #11981

Merged
merged 1 commit into from
Feb 22, 2021

Conversation

noroadsleft
Copy link
Member

Description

#10528 was intended to move the source for the Bear 65 and S7 Elephant to the new jacky_studio vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories.

This commit removes the source from the old directories.

cc @MudkipMao

Types of Changes

  • Bugfix
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)

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

PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories.

This commit removes the source from the old directories.
@noroadsleft noroadsleft added bug keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Feb 22, 2021
@noroadsleft noroadsleft requested a review from a team February 22, 2021 20:42
@MudkipMao
Copy link
Contributor

Woops, that's a little embarrassing! Looks good to me, thanks for fixing this!

@spidey3 spidey3 merged commit 76e67a9 into qmk:develop Feb 22, 2021
@noroadsleft noroadsleft deleted the develop-bugfix-jacky-keyboards branch February 22, 2021 22:10
@drashna
Copy link
Member

drashna commented Feb 23, 2021

Woops, that's a little embarrassing! Looks good to me, thanks for fixing this!

No worries! Git can make this stuff a PITA, and I've fallen to this a few times, myself.

drashna pushed a commit to drashna/qmk_firmware that referenced this pull request Feb 23, 2021
PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories.

This commit removes the source from the old directories.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants