www home.shtml

[Karl Berry]

CVSROOT:        /web/www
Module name:    www
Changes by:     Karl Berry <karl>       10/01/07 01:07:54

Modified files:
        .              : home.shtml 

Log message:
        sigh, messed up conflict, still working

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.shtml?cvsroot=www&r1=1.362&r2=1.363

Patches:
Index: home.shtml
===================================================================
RCS file: /web/www/www/home.shtml,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -b -r1.362 -r1.363
--- home.shtml  7 Jan 2010 01:06:08 -0000       1.362
+++ home.shtml  7 Jan 2010 01:07:47 -0000       1.363
@@ -280,7 +280,6 @@
      <a href="/software/pgccfd/">pgccfd</a>,
      <a href="/software/polyxmass/">polyxmass</a>,
      <a href="/software/rpge/">rpge</a>,
-<<<<<<< home.shtml
      <a href="/software/vmslib/">vmslib</a>.</li>
   <!-- Expire when volunteers call removed -->
   <li><strong>Long-term contribution:</strong>
@@ -300,10 +299,6 @@
      or <a href="/server/standards/translations/priorities.html#Orphaned">
      become a coordinator</a> of a www.gnu.org translation team.
      </li>
-=======
-     <a href="/software/vmslib/">vmslib</a>,
-     <a href="/software/xmorph/">xmorph</a>.</li>
->>>>>>> 1.361
 </ul>
 
 <!-- END GetInvolved -->
@@ -405,7 +400,7 @@
 
 <p>Last Updated:
    <!-- timestamp start -->
-   $Date: 2010/01/07 01:06:08 $
+   $Date: 2010/01/07 01:07:47 $
    <!-- timestamp end -->
 </p>