fix: resolve version conflict in package.json

2026-02-24 22:32:11 +11:00
parent 31225233c5
commit 2ef6e225f4
1 changed files with 1 additions and 7 deletions
--- a/package.json
+++ b/package.json
@@ -1,14 +1,8 @@
 {
  "name": "paarrot",
-<<<<<<< HEAD
-  "version": "4.11.23",
+  "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"