Merge pull request #24 from dr2okevin/master

Bugfix: wrong conflicts
cobwebch · Apr 22, 2016 · f2a16e4 · f2a16e4
2 parents 674d89b + be2665e
commit f2a16e4
Showing 1 changed file with 2 additions and 2 deletions.
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(),
         ),