From 2b5b22d5f0cbad081c32064d3f4c52f530cb27d4 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 14 Feb 2024 13:57:17 +0100
Subject: [PATCH] Fixed composer.json merge conflict

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b681b96a3..e80227924 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,7 @@
         "phpoffice/phpspreadsheet": "^1.23",
         "robmorgan/phinx": "^0.13.4",
         "textalk/websocket": "^1.6",
-        "chillerlan/php-qrcode": "^4"
+        "chillerlan/php-qrcode": "^4",
+        "phpseclib/phpseclib": "^3.0"
     }
 }