[BUGFIX] Remove conflicts entry in fluid_styled_content 56/43656/4
authorStefan Froemken <froemken@gmail.com>
Wed, 30 Sep 2015 12:22:46 +0000 (14:22 +0200)
committerSascha Egerer <sascha@sascha-egerer.de>
Wed, 30 Sep 2015 13:07:15 +0000 (15:07 +0200)
commit30a4c1bdadece6a9600cf4342b4c448f25975aa6
treeed780f4c96bbf20cbbd2b6deabc04ef8628e23a6
parent755a948bea34d2269dc77720d37091bba5105a0b
[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: 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