Skip to content

Commit

Permalink
Publish
Browse files Browse the repository at this point in the history
 - @yeoman/conflicter@2.0.0-alpha.0
  • Loading branch information
mshima committed Oct 11, 2023
1 parent 202bbde commit 3a96492
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions workspaces/conflicter/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.0.0-alpha.0](https://github.com/yeoman/yeoman-api/compare/@yeoman/conflicter@1.1.0...@yeoman/conflicter@2.0.0-alpha.0) (2023-10-11)

### ⚠ BREAKING CHANGES

- **conflicter:** update dependencies and bump node version

### Features

- **conflicter:** emit .yo-resolve file instead of editing ([202bbde](https://github.com/yeoman/yeoman-api/commit/202bbde4b392084d349443dd9d4d3ab2972c9810))
- **conflicter:** update dependencies and bump node version ([bebd6d4](https://github.com/yeoman/yeoman-api/commit/bebd6d4746471dcb4781b26c43e72f7ca43fe40a))

## [1.1.0](https://github.com/yeoman/yeoman-api/compare/@yeoman/conflicter@1.0.12...@yeoman/conflicter@1.1.0) (2023-10-11)

### Features
Expand Down
2 changes: 1 addition & 1 deletion workspaces/conflicter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@yeoman/conflicter",
"version": "1.1.0",
"version": "2.0.0-alpha.0",
"private": false,
"description": "Conflict resolution for yeoman's generator/environment stack",
"keywords": [
Expand Down

0 comments on commit 3a96492

Please sign in to comment.