This is a conflict between https://github.com/matrix-org/matrix-react-sdk/pull/8104 and https://github.com/matrix-org/matrix-react-sdk/pull/8084 |
||
|---|---|---|
| .. | ||
| structures | ||
| views | ||
| stub-component.js | ||
This is a conflict between https://github.com/matrix-org/matrix-react-sdk/pull/8104 and https://github.com/matrix-org/matrix-react-sdk/pull/8084 |
||
|---|---|---|
| .. | ||
| structures | ||
| views | ||
| stub-component.js | ||