From: foobar <sniper@php.net>
Date: Sun, 26 Jun 2005 12:24:38 +0000 (+0000)
Subject: revert the conflicting part
X-Git-Tag: php-5.0.5RC1~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4144327920943d065451dbe7e2ea1edc8cfff8a;p=php

revert the conflicting part
---

diff --git a/pear/go-pear-list.php b/pear/go-pear-list.php
index a14fe3e426..159180032d 100755
--- a/pear/go-pear-list.php
+++ b/pear/go-pear-list.php
@@ -10,11 +10,7 @@ $packages  = array(
 "PEAR"                  =>    "1.3.5",
 "XML_RPC"               =>    "1.3.0",
 "Console_Getopt"        =>    "1.2",
-<<<<<<< go-pear-list.php
 "Archive_Tar"           =>    "1.3.0",
-=======
-"Archive_Tar"           =>    "1.3.1",
->>>>>>> 1.9.2.4
 
 // required packages for the web frontend
 "PEAR_Frontend_Web"     =>    "0.4",