[php-blog-cvs] serendipity serendipity_functions.inc.php,1.56,1.57

[<gsc...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv17897

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fixed merge conflict


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_functions.inc.php	30 May 2003 14:24:21 -0000	1.56
+++ serendipity_functions.inc.php	30 May 2003 15:05:20 -0000	1.57
@@ -283,13 +283,7 @@
 
 	/* pre-walk the array to collect them keyed by date */
 	$bydate = array();
-<<<<<<< serendipity_functions.inc.php
-	
 	if (!is_array($entries) || $entries[0] == false) {
-=======
-
-	if (!is_array($entries)) {
->>>>>>> 1.43
   		echo "<br />".NO_ENTRIES_TO_PRINT;
 		return;
 	}