From 4fedeee20b225804c27b18d90f7279cea9995711 Mon Sep 17 00:00:00 2001 From: quin lynch Date: Sat, 25 Sep 2021 17:56:21 -0300 Subject: [PATCH] Fix duplicate merge conflicts --- .../Entities/Channels/SocketVoiceChannel.cs | 2 -- .../Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs | 1 - 2 files changed, 3 deletions(-) diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs index cd3fa41d3..e57051e80 100644 --- a/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs +++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs @@ -36,8 +36,6 @@ namespace Discord.WebSocket /// public string Mention => MentionUtils.MentionChannel(Id); - /// - public string Mention => MentionUtils.MentionChannel(Id); /// public Task SyncPermissionsAsync(RequestOptions options = null) => ChannelHelper.SyncPermissionsAsync(this, Discord, options); diff --git a/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs b/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs index 736fd916e..61a32e391 100644 --- a/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs +++ b/test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs @@ -27,7 +27,6 @@ namespace Discord public string Name => throw new NotImplementedException(); public DateTimeOffset CreatedAt => throw new NotImplementedException(); - public string Mention => throw new NotImplementedException(); public ulong Id => throw new NotImplementedException(); public Task AddPermissionOverwriteAsync(IRole role, OverwritePermissions permissions, RequestOptions options = null)