diff options
author | Thomi Richards <thomi.richards@canonical.com> | 2013-12-02 18:21:08 +1300 |
---|---|---|
committer | Thomi Richards <thomi.richards@canonical.com> | 2013-12-02 18:21:08 +1300 |
commit | a279fbd89bf49237368e6bfd22278e79f56a2372 (patch) | |
tree | 410f2661a989812d0f0aae4861b523db46b3f6d8 /setup.py | |
parent | 1ee230bbe58895d769ba5793eae2272b32de10c9 (diff) | |
parent | d2776fbb08a7edf6c69974586f06888fe94bdff8 (diff) | |
download | subunit-git-a279fbd89bf49237368e6bfd22278e79f56a2372.tar.gz |
Merged trunk, fixed conflict.
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -11,7 +11,7 @@ else: 'install_requires': [ 'extras', 'testscenarios', - 'testtools>=0.9.30', + 'testtools>=0.9.34', ] } |