From 3b77ad9325d6ab8cb4bcb2d42580ed7988b552bb Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 21 Nov 2024 13:30:38 -0300 Subject: [PATCH] chore: publish - @yeoman/conflicter@2.3.2 --- package-lock.json | 2 +- workspaces/conflicter/CHANGELOG.md | 5 +++++ workspaces/conflicter/package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75d9bd4..e9bacbd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11993,7 +11993,7 @@ }, "workspaces/conflicter": { "name": "@yeoman/conflicter", - "version": "2.3.1", + "version": "2.3.2", "license": "MIT", "dependencies": { "@yeoman/transform": "^1.2.0", diff --git a/workspaces/conflicter/CHANGELOG.md b/workspaces/conflicter/CHANGELOG.md index 00dc546..fe78d2a 100644 --- 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.2 (2024-11-21) + +- fix: adjust diff behavior change (#59) ([723f5f3](https://github.com/yeoman/yeoman-api/commit/723f5f3)), closes [#59](https://github.com/yeoman/yeoman-api/issues/59) +- chore(deps-dev): bump @types/diff from 5.2.3 to 6.0.0 (#58) ([5d3b46e](https://github.com/yeoman/yeoman-api/commit/5d3b46e)), closes [#58](https://github.com/yeoman/yeoman-api/issues/58) + ## 2.3.1 (2024-10-14) - chore: drop package-lock added by editor ([0963f8f](https://github.com/yeoman/yeoman-api/commit/0963f8f)) diff --git a/workspaces/conflicter/package.json b/workspaces/conflicter/package.json index a74f698..3f8912c 100644 --- a/workspaces/conflicter/package.json +++ b/workspaces/conflicter/package.json @@ -1,6 +1,6 @@ { "name": "@yeoman/conflicter", - "version": "2.3.1", + "version": "2.3.2", "private": false, "description": "Conflict resolution for yeoman's generator/environment stack", "keywords": [