fix merge conflict

provenance-io · Apr 12, 2024 · e1c28cc · e1c28cc
1 parent a479728
commit e1c28cc
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,11 +52,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * Remove handlers from provenance modules [#1760](https://github.com/provenance-io/provenance/issues/1760).
 * Updated app.go to use RegisterStreamingServices on BaseApp [#1760](https://github.com/provenance-io/provenance/issues/1760).
 * Bump the SDK to `v0.50.5-pio-1` (from an earlier ephemeral version) [#1897](https://github.com/provenance-io/provenance/pull/1897).
-<<<<<<< HEAD
 * Removed `rewards` module [#1905](https://github.com/provenance-io/provenance/pull/1905).
-=======
 * Remove unused navs [#1920](https://github.com/provenance-io/provenance/issues/1920).
->>>>>>> main
 
 ### Dependencies