From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/fetchmail/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/fetchmail') diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile index 0d18d70cc..e30790fc8 100644 --- a/package/fetchmail/Makefile +++ b/package/fetchmail/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= fetchmail PKG_VERSION:= 6.3.26 PKG_RELEASE:= 1 PKG_MD5SUM:= d9ae3d939205a3c06a21ea79b8f14793 -PKG_DESCR:= fetch mail from a POP or IMAP server -PKG_SECTION:= mail +PKG_DESCR:= fetch mail from a pop3 or imap server +PKG_SECTION:= net/mail PKG_URL:= http://fetchmail.berlios.de/ PKG_SITES:= http://download.berlios.de/fetchmail/ -- cgit v1.2.3