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 | d1ea75cbf03185b316046c35c23ec401e476db95 (patch) | |
| tree | 6f0ed7ea29e5b1393d306731a88f0c716180afd6 /tox.ini | |
| parent | c8685642cb6f7770bde8011619b08e0eb91d7ea8 (diff) | |
| download | pylint-git-d1ea75cbf03185b316046c35c23ec401e476db95.tar.gz | |
Deal with a merge conflict
--HG--
branch : python_6
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} |