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/bzr/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/bzr') diff --git a/package/bzr/Makefile b/package/bzr/Makefile index 42ff286db..8e9843ecc 100644 --- a/package/bzr/Makefile +++ b/package/bzr/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= bzr PKG_VERSION:= 2.6.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 28c86653d0df10d202c6b842deb0ea35 -PKG_DESCR:= bazaar -PKG_SECTION:= scm +PKG_DESCR:= source code management system +PKG_SECTION:= dev/scm PKG_BUILDDEP:= python2 PKG_DEPENDS:= python2 PKG_URL:= http://bazaar.canonical.com/en/ -- cgit v1.2.3