diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-02-18 13:14:15 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-02-18 13:14:15 -0800 |
| commit | eaaee49f9b18248eb4cbfe170ce286622e71f920 (patch) | |
| tree | 3180c357a8c7172e0671313f7b2714d30dcc92e0 /src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs | |
| parent | 492968f7d92bae2b9c88059521ad2f5c81594d8f (diff) | |
| parent | 62a9641f825290617bb9c30d0a58e7d4f59c52d6 (diff) | |
Merge github.com:grpc/grpc into an-update-on-c++
Diffstat (limited to 'src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs')
| -rw-r--r-- | src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs b/src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs index 1bc6cce401..8656b1bf01 100644 --- a/src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs +++ b/src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs @@ -2,11 +2,11 @@ // Copyright 2015, Google Inc. // All rights reserved. -// +// // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions are // met: -// +// // * Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // * Redistributions in binary form must reproduce the above @@ -16,7 +16,7 @@ // * Neither the name of Google Inc. nor the names of its // contributors may be used to endorse or promote products derived from // this software without specific prior written permission. -// +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |