www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/doc potentialauthors.html


From: D E Evans
Subject: www/doc potentialauthors.html
Date: Thu, 07 Feb 2008 23:20:14 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     D E Evans <sinuhe>      08/02/07 23:20:14

Modified files:
        doc            : potentialauthors.html 

Log message:
        Correct merge breakage.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/potentialauthors.html?cvsroot=www&r1=1.14&r2=1.15

Patches:
Index: potentialauthors.html
===================================================================
RCS file: /web/www/www/doc/potentialauthors.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- potentialauthors.html       17 Oct 2007 19:31:35 -0000      1.14
+++ potentialauthors.html       7 Feb 2008 23:19:51 -0000       1.15
@@ -65,18 +65,13 @@
 consider joining the volunteer GNU Writing Movement.  For more information,
 send email to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.<br>
 
-<<<<<<< potentialauthors.html
-<P>
-<a href="http://savannah.gnu.org/projects/tasklist";>Check the "help wanted" 
page for GNU
-projects to see if any are currently seeking help with documentation.</a>
-=======
-<p>
-Check the <a
-href="https://savannah.gnu.org/projects/tasklist";>tasklist</a> and <a
-href="http://savannah.gnu.org/people/";>help wanted</a> lists at <a
-href="http://savannah.gnu.org";>Savannah</a> to which projects are
+<p>
+Check the 
+<a href="https://savannah.gnu.org/projects/tasklist";>tasklist</a> and 
+<a href="http://savannah.gnu.org/people/";>help wanted</a> lists at 
+<a href="http://savannah.gnu.org";>Savannah</a> to which projects are
 currently seeking help with documentation.</a>
->>>>>>> 1.13
+</p>
 
 <p>
 GNU Press is also actively looking for books on general computer science,
@@ -141,7 +136,7 @@
 <p>
 Updated: 
 <!-- timestamp start -->
-$Date: 2007/10/17 19:31:35 $ $Author: johnsu01 $ 
+$Date: 2008/02/07 23:19:51 $ $Author: sinuhe $ 
 <!-- timestamp end -->
 <hr>
 </body>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]