eschmid Sat Aug 4 14:07:05 2001 EDT
Modified files:
/phpdoc/en/pear pear.xml
Log:
Removed a conflict.
Index: phpdoc/en/pear/pear.xml
diff -u phpdoc/en/pear/pear.xml:1.6 phpdoc/en/pear/pear.xml:1.7
--- phpdoc/en/pear/pear.xml:1.6 Thu Aug 2 13:37:51 2001
+++ phpdoc/en/pear/pear.xml Sat Aug 4 14:07:05 2001
@@ -1,5 +1,6 @@
-<!-- $Revision: 1.6 $ -->
- <reference id="ref.pear">
+ <reference id="pear.reference">
+<!-- $Revision: 1.7 $ -->
+
<title>PEAR Reference Manual</title>
<titleabbrev>PEAR</titleabbrev>
<partintro>
