diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-15 16:58:49 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-19 10:37:50 -0800 |
| commit | 13e294e0909b8dd43e6bb5c38c8e88e24f3c9af6 (patch) | |
| tree | 0b3bfaaf174dbe5e08d212570f9312aa38a03b05 /src/csharp/Grpc.Core/Properties/AssemblyInfo.cs | |
| parent | d053ded310bda65ad1fdacd507cd85d46fb7f34c (diff) | |
| parent | 7e098a272ccb2b2ac06464064cb59fca857e2e2a (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/csharp/Grpc.Core/Properties/AssemblyInfo.cs')
| -rw-r--r-- | src/csharp/Grpc.Core/Properties/AssemblyInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs index 29db85d7aa..bde74945fb 100644 --- a/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs @@ -18,4 +18,4 @@ using System.Runtime.CompilerServices; "71394ee9672dfe5b55ea0f95dfd5a7f77d22c962ccf51320d3")] #else [assembly: InternalsVisibleTo("Grpc.Core.Tests")] -#endif
\ No newline at end of file +#endif |