fix: resolve package.json merge conflict [skip ci]

2026-04-17 19:51:22 +10:00
parent 1f74a133a5
commit 6ef5fcc2ed
1 changed files with 0 additions and 4 deletions
--- 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"