From 6ef5fcc2ed292e12c086f574ecdfc8c6b9d29d93 Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Fri, 17 Apr 2026 19:51:22 +1000
Subject: [PATCH] fix: resolve package.json merge conflict [skip ci]

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index 81bdf49..a6b5db8 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "paarrot",
-<<<<<<< HEAD
   "version": "4.11.72",
-=======
-  "version": "4.11.83",
->>>>>>> 47f1b2c40f38dfeb985a1965fe4222614cdfcf23
   "description": "Paarrot - A Matrix client based on Cinny",
   "engines": {
     "node": ">=18.0.0"