From 2ef6e225f4b9527793f5ebfd4c1c35c91358d9f2 Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Tue, 24 Feb 2026 22:32:11 +1100
Subject: [PATCH] fix: resolve version conflict in package.json

---
 package.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 756fcba..aaccaa8 100644
--- 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"