Fix bad merge

This commit is contained in:
Travis Ralston 2018-08-27 19:18:14 -06:00
parent 4278a9a516
commit 4b05194a91

View file

@ -21,13 +21,6 @@
"join_rule": "invite"
}
}
},
{
"type": "m.room.join_rules",
"state_key": "",
"content": {
"join_rule": "invite"
}
}
]
}