Skip to content

Commit bceffac

Browse files
resolve: automatic conflict resolution for back-merge
Conflicts resolved automatically: - Version files: kept develop branch versions (newer) - Other conflicts may require manual review
2 parents 3d4dfd9 + 4e3a6e0 commit bceffac

File tree

2 files changed

+32
-0
lines changed

2 files changed

+32
-0
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## [v1.1.1] - 2025-09-08
2+
3+
### Fixed
4+
5+
- Correct changelog script arguments in create-release workflow (4b1f559)
6+
7+
### Maintenance
8+
9+
- Prepare v1.1.1 hotfix (ebdc3b8)
10+
11+
### Other
12+
13+
- Duplicate create-release.yml workflow (2a30f06)
14+
115
## [v1.1.0] - 2025-09-08
216

317
### Added

tag_changelog.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
hotfix v1.1.1
2+
3+
Merged PR: https://github.com/banua-coder/pico-api-docs/pull/17
4+
Merged by: @ryanaidilp
5+
6+
Changes since v1.1.0:
7+
8+
🚀 Features:
9+
10+
🐛 Bug Fixes:
11+
- fix: correct changelog script arguments in create-release workflow (4b1f559)
12+
13+
🛠️ Other Changes:
14+
- docs(CHANGELOG): re-generate changelog (3901d7a)
15+
- chore: prepare v1.1.1 hotfix (ebdc3b8)
16+
- remove: duplicate create-release.yml workflow (2a30f06)
17+
18+
🚀 Deployment will be triggered automatically.

0 commit comments

Comments
 (0)