From 72fae6c9aede7469cdb463727bc7d23917784fa7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 5 Sep 2013 21:05:54 +0000
Subject: testing/py-flake8-todo: new aport

TODO notes checker plugin for flake8
https://github.com/schlamar/flake8-todo
---
 testing/py-flake8-todo/APKBUILD | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'testing')

diff --git a/testing/py-flake8-todo/APKBUILD b/testing/py-flake8-todo/APKBUILD
index 53ee8e6533..40a4cfd23c 100644
--- a/testing/py-flake8-todo/APKBUILD
+++ b/testing/py-flake8-todo/APKBUILD
@@ -2,7 +2,11 @@
 # 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"
@@ -36,6 +40,12 @@ 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
-- 
cgit v1.2.3