cvs: phpweb / index.php

rasmus Sat Sep 22 15:34:40 2001 EDT Modified files: /phpweb index.php Log: Fix Index: phpweb/index.php diff -u phpweb/index.php:1.146 phpweb/index.php:1.147 --- phpweb/index.php:1.146 Sat Sep 22 15:28:41 2001 +++ phpweb/index.php Sat Sep 22 15:34:39 2001 @@ -78,26 +78,6 @@ <h1>Rackspace providing additional hosting for PHP project</h1> <?php print_link("http://www.rackspace.com/?supbid=php.net", make_image("rackspace.gif", "Rackspace", "right") ); ?> -<<<<<<< index.php -<h1>Mailing Lists, CVS temporarily unavailable</h1> - -<p> -<font class="newsDate">[24-May-2001]</font> -The PHP mailing lists, news server, and CVS repository are all temporarily -off-line. We hope to all of these services restored as soon as possible. Thank -you for your patience! -<br clear="all"> -</p> - -<? echo hdelim(); ?> - -<?/* move this entry to the top when you update it! */?> -<h1> -<? print_link("/usage.php", make_image("stats-small.gif", "PHP Usage Stats", "right") ); ?> -New Usage Stats For May available -</h1> -======= ->>>>>>> 1.143 <p> <font class="newsDate">[17-Sep-2001]</font> Thanks to the generous folks at <a