Appease the new PR workflow "check-whitespace" #303
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…he index has been redirected Fix trailing whitespace.
This fixes indent with spaces.
This fixes trailing whitespace.
This fixes trailing whitespace (CR/LF line endings).
This fixes trailing whitespace.
This fixes trailing whitespace.
This has been addressed in the meantime, but is still admonished by the `check-whitespace` PR job, therefore we merge the fix here with `-s ours`.
This fixes trailing whitespace.
jeffhostetler
approved these changes
Dec 16, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The only slightly iffy issue with this PR is that applying 176a613 will cause merge conflicts in later commits, but they should be trivial to resolve (use
git checkout --theirs, I think).