diff options
author | Craig Tiller <ctiller@google.com> | 2015-09-10 11:46:52 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-09-10 11:46:52 -0700 |
commit | be947697d7c5edb1f67c9df5ef024e3eaf98e9e6 (patch) | |
tree | 774f0d333b48de97236fdb3e9382765a575a75ce /src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs | |
parent | 3121fd4d757991e7ef95a7b6b370b83c23ba61b6 (diff) | |
parent | 374cd9b0abbcd0dc3f1e65777e0dd37a9d5c447f (diff) |
Merge github.com:grpc/grpc into immolating-conversion
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs')
-rw-r--r-- | src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs b/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs index f3158aeb45..7bc17a207f 100644 --- a/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs +++ b/src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs @@ -36,9 +36,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using grpc.testing; using Grpc.Core; using Grpc.Core.Utils; +using Grpc.Testing; using NUnit.Framework; namespace Grpc.IntegrationTesting |