odd merge conflict fixed

diff --git a/pear/PEAR.php b/pear/PEAR.php
index 2a7812316c5602b85cb945b32a6f7825454d455e..a10d90373b7ea1ac92b070e90cae86ed5d26dfba 100644 (file)
--- a/pear/PEAR.php
+++ b/pear/PEAR.php
@@ -18,11 +18,7 @@
 // |          Tomas V.V.Cox <cox@idecnet.com>                             |
 // +----------------------------------------------------------------------+
 //
-<<<<<<< PEAR.php
 // $Id$
-=======
-// $Id$
->>>>>>> 1.71
 //
 
 define('PEAR_ERROR_RETURN',     1);