From cd6a195ff370c3e103b092a50345f7997dcdbc79 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Fri, 31 May 2024 16:37:34 +0200
Subject: [PATCH] Add CHANGELOG entry

(cherry picked from commit b4d551e755116cee3e502ef72a4aeb3f3d68dc9a)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fdcb8761c..2110a334bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to
 ### Changed
 
 - cosmwasm-std: Deprecate "compact" serialization of `Binary`, `HexBinary`,
+<<<<<<< HEAD
   `Checksum` ([#2128])
 
 [#2128]: https://github.com/CosmWasm/cosmwasm/pull/2128
@@ -48,6 +49,26 @@ and this project adheres to
 
 [#2098]: https://github.com/CosmWasm/cosmwasm/pull/2098
 [#2107]: https://github.com/CosmWasm/cosmwasm/pull/2107
+=======
+  `Checksum` ([#2125])
+- cosmwasm-vm: Update wasmer to 4.3.1 ([#2147], [#2153])
+- cosmwasm-vm: Rebalance gas costs for cryptographic functions and wasm
+  instructions. ([#2152])
+- cosmwasm-std: Add message_info and deprecate mock_info ([#2160])
+
+[#2044]: https://github.com/CosmWasm/cosmwasm/pull/2044
+[#2051]: https://github.com/CosmWasm/cosmwasm/pull/2051
+[#2059]: https://github.com/CosmWasm/cosmwasm/pull/2059
+[#2063]: https://github.com/CosmWasm/cosmwasm/pull/2063
+[#2070]: https://github.com/CosmWasm/cosmwasm/pull/2070
+[#2080]: https://github.com/CosmWasm/cosmwasm/pull/2080
+[#2108]: https://github.com/CosmWasm/cosmwasm/pull/2108
+[#2125]: https://github.com/CosmWasm/cosmwasm/pull/2125
+[#2147]: https://github.com/CosmWasm/cosmwasm/pull/2147
+[#2152]: https://github.com/CosmWasm/cosmwasm/pull/2152
+[#2153]: https://github.com/CosmWasm/cosmwasm/pull/2153
+[#2160]: https://github.com/CosmWasm/cosmwasm/pull/2160
+>>>>>>> b4d551e75 (Add CHANGELOG entry)
 
 ## [2.0.1] - 2024-04-03