From 641bda2011144be83bea928950a8d9fdbd7f2923 Mon Sep 17 00:00:00 2001
From: jaeseung-bae <119839167+jaeseung-bae@users.noreply.github.com>
Date: Fri, 17 May 2024 09:56:08 +0900
Subject: [PATCH] fix: missing event emissions(EventSetSwap,
 EventAddDenomMetadata) (#1385)

* fix: missing event emissions(EventSetSwap, EventAddDenomMetadata)

* chore: update changelog
---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9775196289..86218264bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,11 +74,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/fbridge) [\#1361](https://github.com/Finschia/finschia-sdk/pull/1361) Fixes fbridge auth checking bug
 * (x/fswap) [\#1365](https://github.com/Finschia/finschia-sdk/pull/1365) fix update swap keys for possibly overlapped keys(`(hello,world) should be different to (hel,loworld)`)
 * (x/fswap) [\#1379](https://github.com/Finschia/finschia-sdk/pull/1379) add missing router registration
-<<<<<<< HEAD
 * (x/fswap, x/fbridge) [\#1380](https://github.com/Finschia/finschia-sdk/pull/1380) Fix bug where amino is not supported in fswap and fbridge (backport #1378)
-=======
 * (x/fswap) [\#1385](https://github.com/Finschia/finschia-sdk/pull/1385) add accidentally deleted event emissions(EventSetSwap, EventAddDenomMetadata)
->>>>>>> baab52684 (fix: missing event emissions(EventSetSwap, EventAddDenomMetadata) (#1385))
 
 ### Removed