-
Notifications
You must be signed in to change notification settings - Fork 44
Fix comment style consistency #110
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
Conversation
bcl
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good!
dcantrell
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
|
I approve but I'm all over the place approving and merging PRs, can you resolve the conflicts so I can merge this one? |
|
Yup, done – not sure how I missed the semicolon problem in the original PR (the fix for which caused conflicts here), oh well. |
|
Can't merge, still has conflicts. You need to update your fork from main and resolve those conflicts. Sorry. |
|
Hmm, this is what I'm seeing: |
|
GitHub says "This branch cannot be rebased due to conflicts" and has greyed out the Rebase and merge button. I'm confused! ¯_(ツ)_/¯ |
|
Oh wait, you're trying to rebase? It may not work with the merge commit in the branch, do you mind if I just force-push a fresh commit here? |
|
Yeah, there should be no merge commit. They're evil :) Just rebase that one commit on top of main and force push the branch. |
The file uses /* */ comment style and I unintentionally went against that. Fixes: ee4bf04 ("Handle non-UTF-8 device models")
7382fb4 to
89674cf
Compare
|
Yeah fair enough, should be cleaned up now. |
The file uses /* */ comment style and I unintentionally went against that.
Fixes: ee4bf04 ("Handle non-UTF-8 device models")