chore: fix 08-wasm CHANGELOG conflict.

cosmos · Aug 7, 2024 · 86d92b1 · 86d92b1
1 parent 85f90be
commit 86d92b1
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/modules/light-clients/08-wasm/CHANGELOG.md b/modules/light-clients/08-wasm/CHANGELOG.md
@@ -38,11 +38,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Dependencies
 
-<<<<<<< HEAD
 * [\#6807](https://github.com/cosmos/ibc-go/pull/6807) Update wasmvm to v2.1.0.
-=======
 * [\#6828](https://github.com/cosmos/ibc-go/pull/6828) Bump Cosmos SDK to v0.50.9.
->>>>>>> 3425726a (deps: bump cosmos-sdk to v0.50.9 (#6828))
 * [\#6848](https://github.com/cosmos/ibc-go/pull/6848) Bump CometBFT to v0.38.10.
 
 ### API Breaking