diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/bzr | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/bzr')
| -rw-r--r-- | package/bzr/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
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/ |