From 390c211a1c757c7e6bb8cf50e93b9ff99747fb1a Mon Sep 17 00:00:00 2001 From: Bryan White Date: Mon, 22 Jan 2024 12:44:30 +0100 Subject: [PATCH 1/2] docs: vote-extensions link in UPGRADING.md (#19155) (cherry picked from commit 7711baa49fbcd751382aa8ce25d97d9fab1cef49) # Conflicts: # UPGRADING.md --- UPGRADING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UPGRADING.md b/UPGRADING.md index 1f610f2a3e87..4483f0fb3177 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -64,7 +64,11 @@ is `BeginBlock` -> `DeliverTx` (for all txs) -> `EndBlock`. ABCI++ 2.0 also brings `ExtendVote` and `VerifyVoteExtension` ABCI methods. These methods allow applications to extend and verify pre-commit votes. The Cosmos SDK allows an application to define handlers for these methods via `ExtendVoteHandler` +<<<<<<< HEAD and `VerifyVoteExtensionHandler` respectively. Please see [here](https://docs.cosmos.network/v0.50/building-apps/vote-extensions) +======= +and `VerifyVoteExtensionHandler` respectively. Please see [here](https://docs.cosmos.network/v0.50/build/building-apps/vote-extensions) +>>>>>>> 7711baa49 (docs: vote-extensions link in UPGRADING.md (#19155)) for more info. #### Set PreBlocker From 7b5e49f385718a08c97286065110889136c19b85 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Mon, 22 Jan 2024 12:52:06 +0100 Subject: [PATCH 2/2] fix conflicts --- UPGRADING.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/UPGRADING.md b/UPGRADING.md index 4483f0fb3177..354844624ae6 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -64,11 +64,7 @@ is `BeginBlock` -> `DeliverTx` (for all txs) -> `EndBlock`. ABCI++ 2.0 also brings `ExtendVote` and `VerifyVoteExtension` ABCI methods. These methods allow applications to extend and verify pre-commit votes. The Cosmos SDK allows an application to define handlers for these methods via `ExtendVoteHandler` -<<<<<<< HEAD -and `VerifyVoteExtensionHandler` respectively. Please see [here](https://docs.cosmos.network/v0.50/building-apps/vote-extensions) -======= and `VerifyVoteExtensionHandler` respectively. Please see [here](https://docs.cosmos.network/v0.50/build/building-apps/vote-extensions) ->>>>>>> 7711baa49 (docs: vote-extensions link in UPGRADING.md (#19155)) for more info. #### Set PreBlocker