Merge branch 'main' of http://synbox.ruv.wtf:8418/litruv/cinny-desktop

fix: resolve version conflict in package.json
2026-02-24 22:32:27 +11:00 · 2026-02-24 22:32:11 +11:00
1 changed files with 0 additions and 6 deletions
--- a/package.json
+++ b/package.json
@@ -1,14 +1,8 @@
 {
  "name": "paarrot",
-<<<<<<< HEAD
  "version": "4.11.24",
  "description": "Paarrot - A Matrix client based on Cinny",
  "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",
  "engines": {
    "node": ">=18.0.0"
Author	SHA1	Message	Date
Max Litruv Boonzaayer	54bedf0fcd	Merge branch 'main' of http://synbox.ruv.wtf:8418/litruv/cinny-desktop Some checks failed Build / increment-version (push) Successful in 7s Details Build / build-linux (push) Failing after 1m33s Details Build / create-release (push) Has been cancelled Details Build / build-windows (push) Has been cancelled Details	2026-02-24 22:32:27 +11:00
Max Litruv Boonzaayer	2ef6e225f4	fix: resolve version conflict in package.json	2026-02-24 22:32:11 +11:00