From 290f125a13c3c9f5cb772909248d4e482dcfb871 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 25 Apr 2016 14:42:59 +0100
Subject: [PATCH] Typo

---
 synapse/util/room_name.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/util/room_name.py b/synapse/util/room_name.py
index d85ccaea55..f55ef293b6 100644
--- a/synapse/util/room_name.py
+++ b/synapse/util/room_name.py
@@ -29,7 +29,7 @@ def calculate_room_name(room_state, user_id):
         if m_room_name.content and m_room_name.content["name"]:
             return m_room_name.content["name"]
 
-    # does it have a caononical alias?
+    # does it have a canonical alias?
     if ("m.room.canonical_alias", "") in room_state:
         canon_alias = room_state[("m.room.canonical_alias", "")]
         if (
-- 
GitLab