From 1594eba29e7c47ebc46a1fd73e1cfb6742a66df9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 Aug 2016 16:44:07 +0100
Subject: s/underride/override/ in the rule_id too

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

(limited to 'synapse')

diff --git a/synapse/push/baserules.py b/synapse/push/baserules.py
index 9d60f76968..edb00ed206 100644
--- a/synapse/push/baserules.py
+++ b/synapse/push/baserules.py
@@ -222,7 +222,7 @@ BASE_APPEND_OVERRIDE_RULES = [
     # way a room rule is lower priority than both but a custom override rule
     # is higher priority than both.
     {
-        'rule_id': 'global/underride/.m.rule.contains_display_name',
+        'rule_id': 'global/override/.m.rule.contains_display_name',
         'conditions': [
             {
                 'kind': 'contains_display_name'
-- 
cgit 1.4.1