fix: resolve weblate merge conflicts

- Keep current version 2025.9.1 over weblate's 2025.8.5
- Remove duplicate changelog headers
- Resolve package.json and package-lock.json version conflicts
This commit is contained in:
Matthieu B
2025-09-10 11:59:42 +02:00
2 changed files with 5 additions and 6 deletions

View File

@@ -27,9 +27,3 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
* display latest invites ([f86964a](https://github.com/wizarrrr/wizarr/commit/f86964a29d3e10d904abc6f148e4de497e6ecca3))
* improve Release-It workflow to properly create PR with changes ([1af32f9](https://github.com/wizarrrr/wizarr/commit/1af32f927f9c3986002acb876491ace25588767e))
* Readme Kwickflix ([4996bce](https://github.com/wizarrrr/wizarr/commit/4996bce2ded3b34e1325a51d85703296d715122d))
# Changelog
All notable changes to Wizarr will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project uses [Calendar Versioning](https://calver.org/).

5
package-lock.json generated
View File

@@ -7,6 +7,11 @@
"": {
"name": "wizarr",
"version": "2025.9.1",
"devDependencies": {
"@csmith/release-it-calver-plugin": "^2023.12.0",
"@release-it/conventional-changelog": "^8.0.0",
"release-it": "^17.0.0"
},
"engines": {
"node": ">=18.0.0"
}