Fix merge conflicts

This commit is contained in:
Christian
2022-11-13 18:41:28 +01:00
parent 2090b08547
commit 3937aa76e3
8 changed files with 48 additions and 40 deletions
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MQTTnet.Extensions.ManagedClient;
using MQTTnet.Implementations;
using MQTTnet.Internal;
using MQTTnet.Server;
namespace MQTTnet.Tests.ManagedMqttClient
@@ -93,7 +94,7 @@ namespace MQTTnet.Tests.ManagedMqttClient
managedClient.ApplicationMessageReceivedAsync += e =>
{
applicationMessages.Add(e.ApplicationMessage);
return PlatformAbstractionLayer.CompletedTask;
return CompletedTask.Instance;
};
await managedClient.SubscribeAsync("B");