Fix auto merge conflict 8138 [skip ci] #8139
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
* Bump up JNI and private version to released 23.04.0 Signed-off-by: Peixin Li <[email protected]> * to follow existing property name in branch-23.06 --------- Signed-off-by: Peixin Li <[email protected]>
* Init changelog for 23.04 Signed-off-by: Peixin Li <[email protected]> * re-generate at 4.14 * re-generated at 04/18 Signed-off-by: Peixin Li <[email protected]> * re-generate to include new changes --------- Signed-off-by: Peixin Li <[email protected]>
…rge-conflict-8138
|
build |
zhanga5
approved these changes
Apr 18, 2023
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.
fix auto-merge conflict at #8138
NOTE: this must be merged as
create a merge commit