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/cvs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/cvs') diff --git a/package/cvs/Makefile b/package/cvs/Makefile index 8dd95856a..f8929f2d9 100644 --- a/package/cvs/Makefile +++ b/package/cvs/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.11.23 PKG_RELEASE:= 2 PKG_MD5SUM:= bf185eb51b5918330a04671c3f3cccde PKG_DESCR:= concurrent version system -PKG_SECTION:= scm +PKG_SECTION:= dev/scm PKG_URL:= http://www.nongnu.org/cvs/ PKG_SITES:= http://ftp.gnu.org/non-gnu/cvs/source/stable/${PKG_VERSION}/ -- cgit v1.2.3