From 190894b6c53ab842bbb0e8f97f8e933f1d8f53d4 Mon Sep 17 00:00:00 2001 From: tom Date: Wed, 22 Nov 2023 10:32:47 -0300 Subject: [PATCH] fix conflicts --- CHANGELOG.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4afe8102498c..130070d3d03c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,17 +36,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog -<<<<<<< HEAD ## [Unreleased] -======= -## [v0.47.4-evmos.2] - 2023-08-15 - -### Improvements - -* (cli) [#44](https://github.com/evmos/cosmos-sdk/pull/44) Convert `DefaultGasAdjustment` to `var` to allow customization of the value - -## [v0.47.4-evmos] - 2023-07-31 ->>>>>>> a3b98a4a1 (chore: convert DefaultGasAdjustment to var (#44)) ### Features @@ -59,6 +49,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (server) [#18478](https://github.com/cosmos/cosmos-sdk/pull/18478) Add command flag to disable colored logs. * (x/gov) [#18025](https://github.com/cosmos/cosmos-sdk/pull/18025) Improve ` q gov proposer` by querying directly a proposal instead of tx events. It is an alias of `q gov proposal` as the proposer is a field of the proposal. * (version) [#18063](https://github.com/cosmos/cosmos-sdk/pull/18063) Allow to define extra info to be displayed in ` version --long` command. +* (cli) [#44](https://github.com/evmos/cosmos-sdk/pull/44) Convert `DefaultGasAdjustment` to `var` to allow customization of the value ### Bug Fixes