[php-blog-cvs] r2409 - trunk/include

[garvinhicking at B. <gar...@ma...>]

Author: garvinhicking
Date: 2008-12-20 18:51:46 +0100 (Sat, 20 Dec 2008)
New Revision: 2409

Modified:
   trunk/include/functions_config.inc.php
Log:
fix parse problem


Modified: trunk/include/functions_config.inc.php
===================================================================
--- trunk/include/functions_config.inc.php	2008-12-20 17:00:22 UTC (rev 2408)
+++ trunk/include/functions_config.inc.php	2008-12-20 17:51:46 UTC (rev 2409)
@@ -745,11 +745,7 @@
             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" />';