Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/util/metrics.py b/synapse/util/metrics.py

index e1f374807e..0b944d3e63 100644
--- a/synapse/util/metrics.py
+++ b/synapse/util/metrics.py
@@ -84,7 +84,7 @@ class Measure(object):
 
         if context != self.start_context:
             logger.warn(
-                "Context have unexpectedly changed from '%s' to '%s'. (%r)",
+                "Context has unexpectedly changed from '%s' to '%s'. (%r)",
                 context, self.start_context, self.name
             )
             return