From 30a4c1bdadece6a9600cf4342b4c448f25975aa6 Mon Sep 17 00:00:00 2001 From: Stefan Froemken <froemken@gmail.com> Date: Wed, 30 Sep 2015 14:22:46 +0200 Subject: [PATCH] [BUGFIX] Remove conflicts entry in fluid_styled_content MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit css_styled_content and fluid_styled_content can be installed at same time. This patch removes the conflicts entry for css_styled_content in fluid_styled_content. Resolves: #70217 Releases: master Change-Id: I72f1246fb0931cbe6a3b91a87b546f0f7365bf7f Reviewed-on: http://review.typo3.org/43656 Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de> Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de> Reviewed-by: Stephan Großberndt <stephan@grossberndt.de> Reviewed-by: Benjamin Kott <info@bk2k.info> Tested-by: Benjamin Kott <info@bk2k.info> Reviewed-by: Sascha Egerer <sascha@sascha-egerer.de> Tested-by: Sascha Egerer <sascha@sascha-egerer.de> --- typo3/sysext/fluid_styled_content/ext_emconf.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/typo3/sysext/fluid_styled_content/ext_emconf.php b/typo3/sysext/fluid_styled_content/ext_emconf.php index 173482a476cb..15e49b580618 100644 --- a/typo3/sysext/fluid_styled_content/ext_emconf.php +++ b/typo3/sysext/fluid_styled_content/ext_emconf.php @@ -11,9 +11,7 @@ $EM_CONF[$_EXTKEY] = array( 'depends' => array( 'typo3' => '7.5.0-7.5.99' ), - 'conflicts' => array( - 'css_styled_content' => '' - ), + 'conflicts' => array(), 'suggests' => array(), ), ); -- GitLab