[docs] resolve changelog conflict #1707
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
[release] 1.0.0-beta
* change release branch from mm2.1 to main * replace mm2.1 to main in eth_tests * ci: disable mac ci steps (#1701) Reviewed-by: ozkanonur <[email protected]>
* propose change.log add a chronological "living" changelog file as a index for the dev.logs * introduce CHANGELOG.md * [docs] update changelog * [docs] add changelog date/tag * update changelog * update date * re-enable mac ci, add one more change log --------- Co-authored-by: shamardy <[email protected]> Reviewed-by: ozkanonur <[email protected]>
Merged
shamardy
approved these changes
Mar 15, 2023
onur-ozkan
approved these changes
Mar 15, 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.
No description provided.