cvs: phpdoc / manual.xml.in
| From: | Hojtsy Gabor | Date: | Sun, 12 Aug 2001 14:26:36 +0000 |
| Subject: | cvs: phpdoc / manual.xml.in | ||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969337020@lists.php.net to get a copy of this message | ||
goba Sun Aug 12 10:26:36 2001 EDT
Modified files:
/phpdoc manual.xml.in
Log:
Fixing last commit of Hartmut, to make the manual build
Index: phpdoc/manual.xml.in
diff -u phpdoc/manual.xml.in:1.78 phpdoc/manual.xml.in:1.79
--- phpdoc/manual.xml.in:1.78 Sun Aug 12 10:20:15 2001
+++ phpdoc/manual.xml.in Sun Aug 12 10:26:36 2001
@@ -109,11 +109,7 @@
&functions.ibase;
&functions.ingres-ii;
&functions.ircg;
-<<<<<<< manual.xml.in
- &functions.java;
-=======
&functions.java;
->>>>>>> 1.70
&functions.ldap;
&functions.mail;
&functions.math;