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

fixed conflicts and made sure keymaps compiled, and some newer (older) keymaps snuck in #7828

Merged
merged 12 commits into from
Jan 13, 2020

Conversation

Rossman360
Copy link
Contributor

Description

Types of Changes

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

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • [x ] 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).

Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

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

The changes to users/manna-harbour_miryoku/* seem to be out of scope, can the changes be reverted please.

@Rossman360 Rossman360 requested a review from zvecr January 11, 2020 05:00
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

The changes to:

  • keyboards/keebio/levinson/rev2/config.h
  • keyboards/keebio/tragicforce68/rules.mk

should be reverted.

git checkout upstream/master -- keyboards/keebio/levinson/rev2/config.h keyboards/keebio/tragicforce68/rules.mk

@noroadsleft noroadsleft requested a review from a team January 13, 2020 00:14
users/rossman360/rossman360.c Outdated Show resolved Hide resolved
users/rossman360/rossman360.c Outdated Show resolved Hide resolved
@noroadsleft noroadsleft merged commit 390a4fd into qmk:master Jan 13, 2020
@noroadsleft
Copy link
Member

Thanks!

HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
…er (older) keymaps snuck in (qmk#7828)

* hope this works

* Some new things crept in

* remove nonsense config file

* spacing fix

* more spacing

* quick revert of mysterious file

* file revert take two

* take three

* take four

* deleted unneeded lines

* brought back not-unneeded line

* whitespace delete
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
…er (older) keymaps snuck in (qmk#7828)

* hope this works

* Some new things crept in

* remove nonsense config file

* spacing fix

* more spacing

* quick revert of mysterious file

* file revert take two

* take three

* take four

* deleted unneeded lines

* brought back not-unneeded line

* whitespace delete
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
…er (older) keymaps snuck in (qmk#7828)

* hope this works

* Some new things crept in

* remove nonsense config file

* spacing fix

* more spacing

* quick revert of mysterious file

* file revert take two

* take three

* take four

* deleted unneeded lines

* brought back not-unneeded line

* whitespace delete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants