Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections

This commit is contained in:
Erik Johnston 2015-01-22 15:57:26 +00:00
commit c2f9768740

View File

@ -295,7 +295,7 @@ class StateHandler(object):
# get around circular deps.
self.hs.get_auth().check(event, auth_events)
return event
except AuthError as e:
except AuthError:
pass
# Oh dear.