github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #109 from khionu/patch-2

Browse Source 
Fix Merge Conflict on Entities/Messages/Message
This commit is contained in:
Christopher F
2016-07-07 23:11:38 -04:00
committed by GitHub
parent 2eca74bac7 5488294e0f
commit a6d6940f07
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net/Entities/Messages/Message.cs
View File

@@ -157,9 +157,7 @@ namespace Discord
model = await Discord.ApiClient.ModifyMessageAsync(guildChannel.Guild.Id, Channel.Id, Id, args).ConfigureAwait(false);
else
model = await Discord.ApiClient.ModifyDMMessageAsync(Channel.Id, Id, args).ConfigureAwait(false);
{
await Discord.ApiClient.AddPinAsync(Channel.Id, Id).ConfigureAwait(false);
}
Update(model, UpdateSource.Rest);
}
public async Task DeleteAsync()