[autofix.ci] apply automated fixes

CosmWasm · Jan 29, 2025 · 83a6413 · 83a6413
1 parent 880fde9
commit 83a6413
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,8 +8,8 @@ and this project adheres to
 
 ## [Unreleased]
 
-<<<<<<< HEAD
-=======
+# <<<<<<< HEAD
+
 ## Added
 
 - cosmwasm-std: Implement `From<Uint64> for u{64,128}`,
@@ -27,7 +27,9 @@ and this project adheres to
 [#2310]: https://github.com/CosmWasm/cosmwasm/pull/2310
 [#2340]: https://github.com/CosmWasm/cosmwasm/pull/2340
 
->>>>>>> 3b8071bf (Implement From<Uint{64,128}> for u{64,128} and From<Int{64,128}> for i{64,128})
+> > > > > > > 3b8071bf (Implement From<Uint{64,128}> for u{64,128} and
+> > > > > > > From<Int{64,128}> for i{64,128})
+
 ## [2.2.0] - 2024-12-17
 
 ### Added