From: Greg Beaver <cellog@php.net>
Date: Fri, 28 Nov 2003 20:07:14 +0000 (+0000)
Subject: odd merge conflict fixed
X-Git-Tag: php-4.3.5RC1~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c878f2708e0004174bdd513a3a5a288e9d0dd81a;p=php

odd merge conflict fixed
---

diff --git a/pear/PEAR.php b/pear/PEAR.php
index 2a7812316c..a10d90373b 100644
--- 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);