diff options
| author |  yang-g <yangg@google.com> | 2015-08-24 14:45:39 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-08-24 14:45:39 -0700 |
| commit | b1f24078338108a0b741a342e4916731f01b2601 (patch) | |
| tree | 80e054b92d5a2100d2af79a324b6c73a8dd765e8 /src/csharp/.gitignore | |
| parent | d392fa04c5866387c981f4cd83392d1a2e3da7a8 (diff) | |
| parent | e29e18ccf07be20da2540b8fc862894ff933aa6c (diff) | |
merge with head and resolve conflicts
Diffstat (limited to 'src/csharp/.gitignore')
| -rw-r--r-- | src/csharp/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/csharp/.gitignore b/src/csharp/.gitignore index ae48956567..48365e32a5 100644 --- a/src/csharp/.gitignore +++ b/src/csharp/.gitignore @@ -5,4 +5,5 @@ test-results packages Grpc.v12.suo TestResult.xml +/TestResults *.nupkg |