mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

fix parse problem

Browse Source
This commit is contained in:
Garvin Hicking 2008-12-20 17:51:46 +00:00
parent a5bac0f36b
commit c355d46cbb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions_config.inc.php
View File

@ -745,11 +745,7 @@ function serendipity_iframe(&$entry, $mode = null, $use_smarty = true) {
break;
case 'preview':
<<<<<<< .mine
echo '<div style="float: left; height: 225px" id="serendipity_preview_spacer"></div>';
=======
echo '<div id="serendipity_preview_spacer" style="float: left; height: 225px"></div>';
>>>>>>> .r2407
serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);
echo '<br id="serendipity_preview_spacer2" style="clear: both" />';