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

2015-01-22 15:57:26 +00:00 · 2015-01-22 15:57:26 +00:00 · c2f9768740
parent b1b85753d7 73dd81ca62
commit c2f9768740
1 changed files with 1 additions and 1 deletions
--- a/synapse/state.py
+++ b/synapse/state.py
@ -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.