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/lzma/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/lzma') diff --git a/package/lzma/Makefile b/package/lzma/Makefile index 8cf989c83..35b197bf2 100644 --- a/package/lzma/Makefile +++ b/package/lzma/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= lzma PKG_VERSION:= 4.32.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 79c31b18a76254c1cb078c1d40a47c44 -PKG_DESCR:= LZMA compression utility -PKG_SECTION:= archive +PKG_DESCR:= compression utility +PKG_SECTION:= app/archive PKG_URL:= http://tukaani.org/lzma/ PKG_SITES:= http://tukaani.org/lzma/ -- cgit v1.2.3