summaryrefslogtreecommitdiffstats
path: root/testing/py-flake8-todo
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2013-09-05 21:07:03 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-09-17 14:26:46 +0000
commitfca0fd3abe195ca76da6e4c732a0364292df3e79 (patch)
treec7477901a9d3cf49a80457f6260e29c988c2c915 /testing/py-flake8-todo
parent72fae6c9aede7469cdb463727bc7d23917784fa7 (diff)
downloadaports-fca0fd3abe195ca76da6e4c732a0364292df3e79.tar.bz2
aports-fca0fd3abe195ca76da6e4c732a0364292df3e79.tar.xz
testing/py-flake8-todo: upgrade to 0.3
Diffstat (limited to 'testing/py-flake8-todo')
-rw-r--r--testing/py-flake8-todo/APKBUILD10
1 files changed, 0 insertions, 10 deletions
diff --git a/testing/py-flake8-todo/APKBUILD b/testing/py-flake8-todo/APKBUILD
index 40a4cfd23..53ee8e653 100644
--- a/testing/py-flake8-todo/APKBUILD
+++ b/testing/py-flake8-todo/APKBUILD
@@ -2,11 +2,7 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=py-flake8-todo
_pkgname=flake8-todo
-<<<<<<< HEAD
pkgver=0.3
-=======
-pkgver=0.2
->>>>>>> testing/py-flake8-todo: new aport
pkgrel=0
pkgdesc="TODO notes checker plugin for flake8"
url="https://github.com/schlamar/flake8-todo"
@@ -40,12 +36,6 @@ package() {
python setup.py install --prefix=/usr --root="$pkgdir" || return 1
}
-<<<<<<< HEAD
md5sums="489b799f09678b0459e24ee71ec757fe flake8-todo-0.3.zip"
sha256sums="462788906ce7a0a6914d95cc61a5502bd157b56878832241d47ddb4f26c9ae0d flake8-todo-0.3.zip"
sha512sums="c5b36d3c42f87588ef4aa8fc9a9fd67b2047183c90e4dce8ac12d1b7656c135bd6635a08d92c463c36bc0fb80f55b42bdb5145841dc1fabf934ca8d76e6008a7 flake8-todo-0.3.zip"
-=======
-md5sums="3afe48d32dedcc6fbcd6ab8321001f5a flake8-todo-0.2.zip"
-sha256sums="0f80a4ba138882db2154eec110f911b85b425b705780639ec462b2e1368aa5ab flake8-todo-0.2.zip"
-sha512sums="65111f3bd0655dfee8bdd27276c692403d972d88ebc468f7e4c17f16a57bceef6dca06e46049987988205e01d9cd26c8b2cee693db0832144425f187a526488d flake8-todo-0.2.zip"
->>>>>>> testing/py-flake8-todo: new aport