Skip to content
This repository was archived by the owner on Feb 23, 2022. It is now read-only.

spec/consensus: canonical vs subjective commit#125

Merged
brapse merged 2 commits intomasterfrom
anton/2769-canonical
Jul 30, 2020
Merged

spec/consensus: canonical vs subjective commit#125
brapse merged 2 commits intomasterfrom
anton/2769-canonical

Conversation

@melekes
Copy link
Contributor

@melekes melekes commented Jul 29, 2020

Copy link
Contributor

@konnov konnov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just changed the wording a bit

Co-authored-by: Igor Konnov <igor.konnov@gmail.com>
mergify bot pushed a commit to tendermint/tendermint that referenced this pull request Jul 30, 2020
@brapse brapse merged commit d46cd7f into master Jul 30, 2020
@brapse brapse deleted the anton/2769-canonical branch July 30, 2020 10:01
@tac0turtle
Copy link
Contributor

tac0turtle commented Jul 30, 2020

@brapse please make sure to squash commits, we should disable it in general for this repo. I'm not sure who has perms to make this change

@ebuchman
Copy link
Contributor

please make sure to squash commits, we should disable it in general for this repo. I'm not sure who has perms to make this change

Linear history now required for merging to master

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants