diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-18 10:29:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-18 10:29:54 +0000 |
| commit | 2635d4e63459d77342d42ef4d2349524bf8fc982 (patch) | |
| tree | c686ff3d612fe3f94b4e7d0e95e9d54da920a190 /synapse/util/__init__.py | |
| parent | Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Merge pull request #77 from matrix-org/failures (diff) | |
| download | synapse-2635d4e63459d77342d42ef4d2349524bf8fc982.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/util/__init__.py')
| -rw-r--r-- | synapse/util/__init__.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index e77eba90ad..79109d0b19 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -99,8 +99,6 @@ class Clock(object): except: pass - return res - given_deferred.addCallbacks(callback=sucess, errback=err) timer = self.call_later(time_out, timed_out_fn) |