Fix bad merge
This commit is contained in:
parent
4278a9a516
commit
4b05194a91
1 changed files with 0 additions and 7 deletions
|
@ -21,13 +21,6 @@
|
||||||
"join_rule": "invite"
|
"join_rule": "invite"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "m.room.join_rules",
|
|
||||||
"state_key": "",
|
|
||||||
"content": {
|
|
||||||
"join_rule": "invite"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue