[gnu-pl] wwwgnudiff - raport nr 281

[Wojciech Kotwica]

--- prev/www/licenses/license-list.html Sun Apr 11 05:28:21 2004
+++ curr/www/licenses/license-list.html Sat Apr 24 05:28:39 2004
@@ -764,15 +764,9 @@
 
 
-<dt>The FreeType license</dt>
-<dd>
-The FreeType license is a non-copyleft free software license which 
-is incompatible with the GPL for technical reasons. 
-<p></p></dd>
+<<<<<<< license-list.html
+<DT><A HREF="http://www.php.net/license/3_0.txt";>The PHP License, Version
+3.0</A>.
 
-
-<dt><a href="http://www.php.net/license/3_0.txt";>The PHP License,
-       Version 3.0</a>.</dt>
-<dd>
-This license is used by most of PHP4.  It is a non-copyleft free software
+<DD>This license is used by most of PHP4.  It is a non-copyleft free software
 license which is incompatible with the GNU GPL.
 <p>
@@ -1354,5 +1348,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2004/04/11 00:39:04 $ $Author: leugimap $
+$Date: 2004/04/23 17:41:01 $ $Author: novalis $
 <!-- timestamp end -->
 </p>