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/git/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/git') diff --git a/package/git/Makefile b/package/git/Makefile index 3bdf0f1d4..f202efb3f 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.8.4.2 PKG_RELEASE:= 2 PKG_MD5SUM:= 6f63d103465b86ca0ebe4189ea54731c PKG_DESCR:= fast version control system -PKG_SECTION:= scm +PKG_SECTION:= dev/scm PKG_BUILDDEP:= openssl curl expat autotool PKG_DEPENDS:= libopenssl libcurl libexpat libpthread PKG_URL:= http://git-scm.com/ -- cgit v1.2.3