From 87d4b29c4c9c8bce39e28ef2c873feb4fb30ec33 Mon Sep 17 00:00:00 2001
From: "rustic-release-plz[bot]"
 <182542030+rustic-release-plz[bot]@users.noreply.github.com>
Date: Wed, 20 Nov 2024 01:59:38 +0100
Subject: [PATCH] chore(conflate): release v0.3.3 (#35)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 🤖 New release
* `conflate`: 0.3.2 -> 0.3.3 (✓ API compatible changes)

<details><summary><i><b>Changelog</b></i></summary><p>

## `conflate`
<blockquote>

##
[0.3.3](https://github.com/rustic-rs/conflate/compare/conflate-v0.3.2...conflate-v0.3.3)
- 2024-11-20

### Added

- enhance MergeFrom trait with detailed documentation and add
MergePrecedence trait for prioritized merging
- add MergeFrom trait to conflate
([#34](https://github.com/rustic-rs/conflate/pull/34))
</blockquote>


</p></details>

---
This PR was generated with
[release-plz](https://github.com/MarcoIeni/release-plz/).

Co-authored-by: rustic-release-plz[bot] <182542030+rustic-release-plz[bot]@users.noreply.github.com>
---
 Cargo.toml                   | 2 +-
 crates/conflate/CHANGELOG.md | 7 +++++++
 crates/conflate/Cargo.toml   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ab8baf9..edaeb22 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ resolver = "2"
 rust-version = "1.64.0"
 
 [workspace.dependencies]
-conflate = { path = "crates/conflate", version = "0.3.2" }
+conflate = { path = "crates/conflate", version = "0.3.3" }
 conflate_derive = { path = "crates/conflate_derive", version = "0.2.0" }
 
 # see: https://nnethercote.github.io/perf-book/build-configuration.html
diff --git a/crates/conflate/CHANGELOG.md b/crates/conflate/CHANGELOG.md
index 84a8fef..d18b0a8 100644
--- a/crates/conflate/CHANGELOG.md
+++ b/crates/conflate/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.3](https://github.com/rustic-rs/conflate/compare/conflate-v0.3.2...conflate-v0.3.3) - 2024-11-20
+
+### Added
+
+- enhance MergeFrom trait with detailed documentation and add MergePrecedence trait for prioritized merging
+- add MergeFrom trait to conflate ([#34](https://github.com/rustic-rs/conflate/pull/34))
+
 ## [0.3.2](https://github.com/rustic-rs/conflate/compare/conflate-v0.3.1...conflate-v0.3.2) - 2024-11-19
 
 ### Added
diff --git a/crates/conflate/Cargo.toml b/crates/conflate/Cargo.toml
index b64ca52..6d488b1 100644
--- a/crates/conflate/Cargo.toml
+++ b/crates/conflate/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "conflate"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["the rustic-rs team", "Robin Krahl <robin.krahl@ireas.org>"]
 categories = ["rust-patterns"]
 documentation = "https://docs.rs/conflate"