merge and fix conflicts

2011-02-23 15:37:00 -08:00
parent f85994880f d4e99b60bb
commit 3723d384c2
1 changed files with 3 additions and 2 deletions
--- a/run_tests.py
+++ b/run_tests.py
@@ -180,6 +180,7 @@ class _NullColorizer(object):
    def write(self, text, color):
        self.stream.write(text)

+
 class NovaTestResult(result.TextTestResult):
    def __init__(self, *args, **kw):
        result.TextTestResult.__init__(self, *args, **kw)