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

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/state.py b/synapse/state.py

index 5b622ad3b1..d9fdfb34be 100644
--- 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.