[autofix.ci] apply automated fixes

(cherry picked from commit 38fea3a) # Conflicts: # packages/vm/Cargo.toml
CosmWasm · Dec 16, 2024 · 62cdc66 · 62cdc66
1 parent 952fab2
commit 62cdc66
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
@@ -20,9 +20,12 @@ pre-release-replacements = [
     { file = "../../CHANGELOG.md", search = "## \\[Unreleased\\]", replace = "## [{{version}}] - {{date}}", exactly = 1 },
     { file = "../../CHANGELOG.md", search = "(U|u)nreleased", replace = "{{version}}" },
     { file = "../../CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n\n## [Unreleased]", exactly = 1 },
-    { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 },
     { file = "../../CHANGELOG.md", search = "<!-- next-url -->\n", replace = "<!-- next-url -->\n\n[unreleased]: https://github.com/CosmWasm/cosmwasm/compare/{{tag_name}}...HEAD", exactly = 1 },
+<<<<<<< HEAD
 >>>>>>> 55ee235b (Fix replacement order)
+=======
+    { file = "../../CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}", exactly = 1 },
+>>>>>>> 38fea3a7 ([autofix.ci] apply automated fixes)
 ]
 
 [features]