revert the conflicting part

diff --git a/pear/go-pear-list.php b/pear/go-pear-list.php
index a14fe3e4261f490954fe0ad4cc08f637066a5d0b..159180032df5b840a94ee5516f8c22e17a1fae9d 100755 (executable)
--- 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",