diff options
| author | Brett Cannon <brett@python.org> | 2014-08-29 15:44:03 -0400 |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2014-08-29 15:44:03 -0400 |
| commit | c2cc31874880d7f0d5bd444c6a3b17fa817e2509 (patch) | |
| tree | c234e08aa390be9bca941e66e508071e5e44a801 /tox.ini | |
| parent | 5b89bb1748d46dfa273cb2a19651227e1e92420a (diff) | |
| download | pylint-c2cc31874880d7f0d5bd444c6a3b17fa817e2509.tar.gz | |
Deal with a merge conflict
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,5 +7,5 @@ deps = logilab-common hg+https://bitbucket.org/logilab/astroid/ six -commands = python -Wi -m unittest discover -s {envsitepackagesdir}/pylint/test/ -p *test_*.py +commands = python -Wi -m unittest discover -s {envsitepackagesdir}/pylint/test/ -p {posargs:*test_*}.py changedir = {toxworkdir} |