SA12xx fixes - rearrange members #3882
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
Also adjusted some whitespace and moved a couple of classes into separate files
david-poindexter
approved these changes
Jun 30, 2020
mitchelsellers
approved these changes
Jul 1, 2020
|
Did'nt we discuss holding on these global auto-fixes after we finish with 9.6.2... We may have huge conflicts to resolve when we merge back release/9.6.2 into develop... |
|
Ok, not too bad, only one file conflict, see #3888 I will try to resolve the conflict later today/tomorrow... |
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.
Also adjusted some whitespace and moved a couple of classes into
separate files