From 28c2ade603c6017b9e6f82c1b4ce62bcefff3ce2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 24 Mar 2020 00:18:17 +0100
Subject: [PATCH] Fixed merge

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

diff --git a/composer.json b/composer.json
index 4d361e7..1f1a12c 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "require": {
         "php"           : "^7.1",
         "sabre/dav"     : "~4.1.0",
-        "twig/twig"     : "~1.8.0"
+        "twig/twig"     : "~1.8.0",
         "symfony/yaml"  : "^3.4"
     },
     "require-dev" : {