From 4b05194a913e210585febe3df1864d2b6e384eab Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 27 Aug 2018 19:18:14 -0600
Subject: [PATCH] Fix bad merge

---
 event-schemas/examples/m.room.member#invite_room_state | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/event-schemas/examples/m.room.member#invite_room_state b/event-schemas/examples/m.room.member#invite_room_state
index 44f160c2..7055d0a0 100644
--- a/event-schemas/examples/m.room.member#invite_room_state
+++ b/event-schemas/examples/m.room.member#invite_room_state
@@ -21,13 +21,6 @@
           "join_rule": "invite"
         }
       }
-    },
-    {
-      "type": "m.room.join_rules",
-      "state_key": "",
-      "content": {
-        "join_rule": "invite"
-      }
     }
   ]
 }