From be2665e67a580a70ae46ad1ef7a18280e4888fc4 Mon Sep 17 00:00:00 2001
From: Kevin Quiatkowski <kevinq@polargold.de>
Date: Wed, 20 Apr 2016 11:41:45 +0200
Subject: [PATCH] Fix conflicts

---
 ext_emconf.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext_emconf.php b/ext_emconf.php
index 214adbb..efe006d 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -37,8 +37,8 @@
                         'typo3' => '7.6.1-7.9.99',
                 ),
                 'conflicts' => array(
-                        'ch_rterecords',
-                        'tinymce_rte',
+                        'ch_rterecords' => '',
+                        'tinymce_rte' => '',
                 ),
                 'suggests' => array(),
         ),