From: Jose V Beneyto <sepen@crux.nu>
Date: Thu, 13 May 2010 08:15:51 +0000 (+0200)
Subject: wget: fixed previous commit (merge issues) on 2.6-noeabi branch
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=1506e7a4c5989ff2dfb31dc5906c6003b0cd41fc;p=attic%2Fports%2Fcore-cross.git

wget: fixed previous commit (merge issues) on 2.6-noeabi branch
---

diff --git a/wget/Pkgfile b/wget/Pkgfile
index 36ef009..84c6c62 100644
--- a/wget/Pkgfile
+++ b/wget/Pkgfile
@@ -1,11 +1,7 @@
 # Description: A network utility for downloading content from the Web
 # URL: http://www.gnu.org/software/wget/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-<<<<<<< HEAD
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-=======
-# Arch Maintainer: CRUX-ARM System Team, devel@crux-arm.nu
->>>>>>> Merged changes from noeabi (72cbd18e791bd2edff0e8d23873136187f0cd936)
 # Depends on: openssl
 
 name=wget