Fix comment style consistency#110
Conversation
|
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")