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

diff --git a/wget/Pkgfile b/wget/Pkgfile
index 36ef009d57d92a25b6812d48a92d62e0e33ae643..84c6c627062318baf3aa33a61dcddfe1377ab922 100644 (file)
--- 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