Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: add latest finschia mainnet/testnet information (backport #400) #401

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 8, 2024

Description

Motivation and context

How has this been tested?

Screenshots (if appropriate):

Checklist:

  • I followed the contributing guidelines and code of conduct.
  • I have added a relevant changelog to CHANGELOG.md
  • I have added tests to cover my changes.
  • I have updated the documentation accordingly.

This is an automatic backport of pull request #400 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jul 8, 2024
@mergify mergify bot requested review from tkxkd0159, zemyblue and 0Tech as code owners July 8, 2024 06:07
Copy link
Author

mergify bot commented Jul 8, 2024

Cherry-pick of 35e3b48 has failed:

On branch mergify/bp/release/v4.0.x/pr-400
Your branch is up to date with 'origin/release/v4.0.x'.

You are currently cherry-picking commit 35e3b48.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from jaeseung-bae as a code owner July 8, 2024 06:07
@mergify mergify bot deleted the mergify/bp/release/v4.0.x/pr-400 branch July 8, 2024 06:09
@jaeseung-bae jaeseung-bae restored the mergify/bp/release/v4.0.x/pr-400 branch July 8, 2024 06:50
@jaeseung-bae jaeseung-bae reopened this Jul 8, 2024
@jaeseung-bae jaeseung-bae self-assigned this Jul 8, 2024
@jaeseung-bae jaeseung-bae force-pushed the mergify/bp/release/v4.0.x/pr-400 branch 2 times, most recently from 5fa3f4f to ab762c9 Compare July 8, 2024 07:03
* docs: finschia mainnet/testnet information

* chore: move finschia readme contents to main README.md

* chore: update tbd links

* chore: update changelog

* chore: remove unnecessary new lines

* Update CHANGELOG.md

Co-authored-by: Jaeseung Lee <[email protected]>

---------

Co-authored-by: Jaeseung Lee <[email protected]>
(cherry picked from commit 35e3b48)

# Conflicts:
#	CHANGELOG.md
@jaeseung-bae jaeseung-bae force-pushed the mergify/bp/release/v4.0.x/pr-400 branch from ab762c9 to c281edf Compare July 8, 2024 07:04
@jaeseung-bae jaeseung-bae added documentation Improvements or additions to documentation and removed conflicts labels Jul 8, 2024
@jaeseung-bae jaeseung-bae merged commit adefd09 into release/v4.0.x Jul 8, 2024
36 checks passed
@jaeseung-bae jaeseung-bae deleted the mergify/bp/release/v4.0.x/pr-400 branch July 8, 2024 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants