diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-18 10:29:29 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-18 10:29:29 +0000 |
commit | fe672a04f7fcaaf35769d97eb2c52017fc51664e (patch) | |
tree | 419f8533df3d91a15ad35d286f36aa719e29f39e /synapse/util | |
parent | Merge pull request #79 from matrix-org/get_pdu_limiting (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into failures (diff) | |
download | synapse-fe672a04f7fcaaf35769d97eb2c52017fc51664e.tar.xz |
Merge pull request #77 from matrix-org/failures
Failures
Diffstat (limited to 'synapse/util')
-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) |