Merge pull request #24 from dr2okevin/master

fsuter · fsuter · commit f2a16e4782b4 · 2016-04-22T21:00:14.000+02:00
Bugfix: wrong conflicts
diff --git 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(),
         ),
