chore: publish

- @yeoman/conflicter@2.3.0
yeoman · Oct 2, 2024 · aa24e0b · aa24e0b
1 parent 7c011a6
commit aa24e0b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/workspaces/conflicter/CHANGELOG.md b/workspaces/conflicter/CHANGELOG.md
@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2.3.0 (2024-10-02)
+
+- feat(conflicter): allow diff in .yo-resolve files (#50) ([baf4465](https://github.com/yeoman/yeoman-api/commit/baf4465)), closes [#50](https://github.com/yeoman/yeoman-api/issues/50)
+- chore(conflicter): convert tests to async/await ([cf5bc4e](https://github.com/yeoman/yeoman-api/commit/cf5bc4e))
+
 ## <small>2.2.1 (2024-10-01)</small>
 
 - fix(conflicter): correctly show file conflict options ([7d8d754](https://github.com/yeoman/yeoman-api/commit/7d8d754))

diff --git a/workspaces/conflicter/package.json b/workspaces/conflicter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yeoman/conflicter",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "private": false,
   "description": "Conflict resolution for yeoman's generator/environment stack",
   "keywords": [