From c878f2708e0004174bdd513a3a5a288e9d0dd81a Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Fri, 28 Nov 2003 20:07:14 +0000
Subject: [PATCH] odd merge conflict fixed

---
 pear/PEAR.php | 4 ----
 1 file changed, 4 deletions(-)

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);
-- 
2.50.1