chore: resolve conflict and update changelog

Signed-off-by: zemyblue <[email protected]>
Finschia · Nov 3, 2023 · ac6ff3d · ac6ff3d
1 parent b1b125e
commit ac6ff3d
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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)