From 51db4f4fa34a83af7bf66e773c63284983be2b04 Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Mon, 21 Aug 2017 11:54:38 +0200
Subject: [PATCH] refactor: fix: conflict solved

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

diff --git a/composer.json b/composer.json
index 3b932d2..5ff6bd3 100644
--- a/composer.json
+++ b/composer.json
@@ -26,4 +26,4 @@
             "QUI\\Ckeditor\\Plugins\\": "src\/QUI\/Ckeditor\/Plugins\/"
         }
     }
-}
\ No newline at end of file
+}
-- 
GitLab