litruv/cinny-desktop
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 1 Wiki Activity

fix: resolve version conflict in package.json

Browse Source
This commit is contained in:
Litruv
2026-02-24 22:32:11 +11:00
parent 31225233c5
commit 2ef6e225f4
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@@ -1,14 +1,8 @@
{ {
"name": "paarrot", "name": "paarrot",
<<<<<<< HEAD "version": "4.11.24",
"version": "4.11.23",
"description": "Paarrot - A Matrix client based on Cinny", "description": "Paarrot - A Matrix client based on Cinny",
"homepage": "http://synbox.ruv.wtf:8418/litruv/cinny-desktop", "homepage": "http://synbox.ruv.wtf:8418/litruv/cinny-desktop",
=======
"version": "4.11.24",
"description": "Yet another matrix client",
"homepage": "https://github.com/ajbura/cinny",
>>>>>>> bd544193be537882c7c69a153c38cc211293c741
"main": "electron/main.js", "main": "electron/main.js",
"engines": { "engines": {
"node": ">=18.0.0" "node": ">=18.0.0"