Skip to content
Snippets Groups Projects
Commit 30a4c1bd authored by Stefan Froemken's avatar Stefan Froemken Committed by Sascha Egerer
Browse files

[BUGFIX] Remove conflicts entry in fluid_styled_content

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: default avatarMathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: default avatarMathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: default avatarStephan Großberndt <stephan@grossberndt.de>
Reviewed-by: default avatarBenjamin Kott <info@bk2k.info>
Tested-by: default avatarBenjamin Kott <info@bk2k.info>
Reviewed-by: default avatarSascha Egerer <sascha@sascha-egerer.de>
Tested-by: default avatarSascha Egerer <sascha@sascha-egerer.de>
parent 755a948b
Branches
Tags
No related merge requests found
......@@ -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(),
),
);
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment