Fix build errors due to merge conflicts

2026-10-15 00:15:15 +08:00 · 2022-11-11 14:41:28 +01:00
parent db1fc7625d
commit 4eb6e77eb5
1 changed files with 2 additions and 2 deletions
@@ -298,7 +298,7 @@ namespace MQTTnet.Adapter
                // Check two times for cancellation because the call to _ReadAsync_ might block for some time.
                if (cancellationToken.IsCancellationRequested)
                {
-                    return ReadFixedHeaderResult.Cancelled;
+                    return ReadFixedHeaderResult.Canceled;
                }

                int bytesRead;
@@ -308,7 +308,7 @@ namespace MQTTnet.Adapter
                }
                catch (OperationCanceledException)
                {
-                    return ReadFixedHeaderResult.Cancelled;
+                    return ReadFixedHeaderResult.Canceled;
                }
                catch (SocketException)
                {