From ac6ff3d9586cdf8a79ed96ad9cb3ec2ed5e26385 Mon Sep 17 00:00:00 2001 From: zemyblue Date: Fri, 3 Nov 2023 15:06:56 +0900 Subject: [PATCH] chore: resolve conflict and update changelog Signed-off-by: zemyblue --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7d0bcf4..76c173b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,11 +39,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Features ### Improvements -<<<<<<< HEAD -======= * (improvements) [\#230](https://github.com/Finschia/finschia/pull/230) fix Makefile for format and execute make format #230 -* (chore) [\#299](https://github.com/Finschia/finschia/pull/299) remove x/token and x/collection apis in swagger ->>>>>>> eeb4ff5 (chore: remove x/token and x/collection apis in swagger (#299)) +* (chore) [\#300](https://github.com/Finschia/finschia/pull/300) remove x/token and x/collection apis in swagger (backport #299) ### Bug Fixes * (finschia-sdk) [\#298](https://github.com/Finschia/finschia/pull/298) bump up finschia-sdk from v0.48.0 to v0.48.1 (backport #297)