From 9decd631e14de8bbee48016fc1fc8565c04ad3b9 Mon Sep 17 00:00:00 2001 From: Zoro Date: Mon, 23 Dec 2024 19:33:51 +0800 Subject: [PATCH] docs: fix dead link in `UPGRADING.md` (#23059) Co-authored-by: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> (cherry picked from commit 2596c7f6be6a7d452b071cc2a924583947e4be41) # Conflicts: # UPGRADING.md --- UPGRADING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UPGRADING.md b/UPGRADING.md index a9aee57cf21c..ebc3f000ecda 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -12,7 +12,11 @@ It is additional to the changes described here. In this section we describe the changes made in Cosmos SDK' SimApp. **These changes are directly applicable to your application wiring.** +<<<<<<< HEAD Please read this section first, but for an exhaustive list of changes, refer to the [CHANGELOG](./simapp/CHANGELOG.md). +======= +Please read this section first, but for an exhaustive list of changes, refer to the [CHANGELOG](https://github.com/cosmos/cosmos-sdk/blob/release/v0.52.x/simapp/CHANGELOG.md). +>>>>>>> 2596c7f6b (docs: fix dead link in `UPGRADING.md` (#23059)) #### Client (`root.go`)