Resolve conflicts

This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View file

@ -48,7 +48,7 @@ export default define({
this.fetching = true;
(this as any).api('channels/show', {
channel_id: this.props.channel
channelId: this.props.channel
}).then(channel => {
this.channel = channel;
this.fetching = false;