summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorThomi Richards <thomi.richards@canonical.com>2013-12-02 18:21:08 +1300
committerThomi Richards <thomi.richards@canonical.com>2013-12-02 18:21:08 +1300
commita279fbd89bf49237368e6bfd22278e79f56a2372 (patch)
tree410f2661a989812d0f0aae4861b523db46b3f6d8 /setup.py
parent1ee230bbe58895d769ba5793eae2272b32de10c9 (diff)
parentd2776fbb08a7edf6c69974586f06888fe94bdff8 (diff)
downloadsubunit-git-a279fbd89bf49237368e6bfd22278e79f56a2372.tar.gz
Merged trunk, fixed conflict.
Diffstat (limited to 'setup.py')
-rwxr-xr-xsetup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index d7089df..5a05002 100755
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ else:
'install_requires': [
'extras',
'testscenarios',
- 'testtools>=0.9.30',
+ 'testtools>=0.9.34',
]
}