Skip to content

Commit

Permalink
chore: rebase to master
Browse files Browse the repository at this point in the history
  • Loading branch information
richardschneider committed May 24, 2019
1 parent 28bdd8a commit f17dec6
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion src/MessageEventArgs.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Net;
using System.Net;

namespace Makaretu.Dns
{
Expand Down
3 changes: 0 additions & 3 deletions src/MulticastService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,6 @@ void Send(Message msg, bool checkDuplicate)
/// <param name="result">
/// The received message <see cref="UdpReceiveResult"/>.
/// </param>
/// <param name="remote">
/// The message sender.
/// </param>
/// <remarks>
/// Decodes the <paramref name="result"/> and then raises
/// either the <see cref="QueryReceived"/> or <see cref="AnswerReceived"/> event.
Expand Down
1 change: 1 addition & 0 deletions src/ServiceDiscovery.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using Common.Logging;
using Makaretu.Dns.Resolving;

Expand Down

0 comments on commit f17dec6

Please sign in to comment.