chore: fix bad merge #5707
Merged
chore: fix bad merge #5707
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
ghpbot-tari-project
added
the
CR-insufficient_context
ghpbot-tari-project
added
P-acks_required
sdbondi
added a commit
to sdbondi/tari
that referenced
this pull request
Sep 1, 2023
* development: ci(feature): add env for proto location (tari-project#5700) fix(comms): timeout and ban for bad behaviour in protocol negotation (tari-project#5679) chore: fix bad merge (tari-project#5707) feat: update genesis blocks (tari-project#5698) feat: improve block sync error handling (tari-project#5691) fix: addition overflow when coinbase + fees is too high (tari-project#5706) fix(horizon_sync): try sync with next next peer if current one fails (tari-project#5699) fix: better timeout for lagging (tari-project#5705)
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.
Description
Fixes a bad merge