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/subversion/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/subversion/Makefile') diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 34f6f1169..82e7522d4 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.7.8 PKG_RELEASE:= 3 PKG_MD5SUM:= 17fe81c30fe0f785b2100ebadb3dc580 PKG_DESCR:= revision control program -PKG_SECTION:= scm +PKG_SECTION:= dev/scm PKG_DEPENDS:= zlib apr apr-util libexpat libsqlite neon PKG_BUILDDEP:= apr-util expat apr zlib libiconv-tiny sqlite neon PKG_URL:= http://subversion.apache.org/ -- cgit v1.2.3