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/zip/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/zip/Makefile') diff --git a/package/zip/Makefile b/package/zip/Makefile index 0fd973dce..a037de3ce 100644 --- a/package/zip/Makefile +++ b/package/zip/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 3.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 7b74551e63f8ee6aab6fbc86676c0d37 PKG_DESCR:= zip compression utility -PKG_SECTION:= archive +PKG_SECTION:= app/archive PKG_URL:= http://www.info-zip.org/Zip.html PKG_SITES:= ftp://ftp.info-zip.org/pub/infozip/src/ -- cgit v1.2.3