diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-19 10:38:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-19 10:38:48 +0000 |
| commit | 8321e8a2e0381f52f3f434223db58f6ea280d89e (patch) | |
| tree | 13c5600cbeb56c7c2837dd2df329f10a239f91ac /synapse/util/__init__.py | |
| parent | Merge pull request #73 from matrix-org/hotfixes-v0.7.0f (diff) | |
| parent | Update release date (diff) | |
| download | synapse-8321e8a2e0381f52f3f434223db58f6ea280d89e.tar.xz | |
Merge branch 'release-v0.7.1' of github.com:matrix-org/synapse
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) |