From 9496cba137b29df3be0a1bbab19046b2518b83fc Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Wed, 4 May 2022 10:53:22 +0200
Subject: [PATCH] Fixed composer.lock

---
 composer.lock | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/composer.lock b/composer.lock
index ea222f2ae..7d9d977d0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,13 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-<<<<<<< HEAD
-    "hash": "7e7441d3ba7b9b2be1f647b9bfc2c941",
-    "content-hash": "d59d1c1f4957fc2e3dc019cbb99b5aa2",
-=======
-    "hash": "40072f80c7fd5e407eaba6591fb2d6ec",
-    "content-hash": "e55258d0e91f60adde23afe67816258a",
->>>>>>> feature-15970/kartenterminal
+    "hash": "6bab4617977e08b2939bf959929632d4",
+    "content-hash": "3e499134721f682f298dda20263ab686",
     "packages": [
         {
             "name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -1352,26 +1347,26 @@
         },
         {
             "name": "netcarver/textile",
-            "version": "v3.7.6",
+            "version": "v3.7.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/textile/php-textile.git",
-                "reference": "1846fd5aeace2a0dd57c4f770f693d12bcd7fa26"
+                "reference": "e5c32b4485741e656cfd94932da8ba7dd4a19da5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/textile/php-textile/zipball/1846fd5aeace2a0dd57c4f770f693d12bcd7fa26",
-                "reference": "1846fd5aeace2a0dd57c4f770f693d12bcd7fa26",
+                "url": "https://api.github.com/repos/textile/php-textile/zipball/e5c32b4485741e656cfd94932da8ba7dd4a19da5",
+                "reference": "e5c32b4485741e656cfd94932da8ba7dd4a19da5",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "php-coveralls/php-coveralls": "2.1.*",
-                "phpunit/phpunit": "5.7.*",
+                "phpstan/phpstan": "1.6.3",
+                "phpunit/phpunit": "^9.5.20",
                 "squizlabs/php_codesniffer": "3.*",
-                "symfony/yaml": "2.4.*"
+                "symfony/yaml": "^4.4.3"
             },
             "type": "library",
             "extra": {
@@ -1401,7 +1396,7 @@
                 "plaintext",
                 "textile"
             ],
-            "time": "2020-01-08 21:13:37"
+            "time": "2022-05-01 17:05:16"
         },
         {
             "name": "nicolaskruchten/pivottable",