www-commits
[Top][All Lists]
Advanced

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

www/licenses fdl.html


From: John Sullivan
Subject: www/licenses fdl.html
Date: Tue, 22 Aug 2006 21:45:10 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     John Sullivan <johnsu01>        06/08/22 21:45:10

Modified files:
        licenses       : fdl.html 

Log message:
        Fix conflict

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/fdl.html?cvsroot=www&r1=1.21&r2=1.22

Patches:
Index: fdl.html
===================================================================
RCS file: /web/www/www/licenses/fdl.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- fdl.html    22 Aug 2006 21:43:36 -0000      1.21
+++ fdl.html    22 Aug 2006 21:45:07 -0000      1.22
@@ -602,11 +602,10 @@
     permitted in any medium without royalty provided this notice is 
     preserved.
   </p>
-
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2006/08/22 21:43:36 $ $Author: johnsu01 $
+    $Date: 2006/08/22 21:45:07 $ $Author: johnsu01 $
     <!-- timestamp end -->
   </p>
 </div>




reply via email to

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