diff options
author | murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2015-02-23 10:29:08 -0800 |
commit | 4d736a024ca45738412f7cf73994393b7f162811 (patch) | |
tree | e2b5085817619e9aba3e4f88407f344b36e911af /src/csharp/Grpc.Examples/.gitignore | |
parent | 2822e9ad7598a68597e49e8f1875486aa12bf267 (diff) | |
parent | 8b131922438d96579cb315777ca980e094883496 (diff) |
Resolved merge conflicts
Diffstat (limited to 'src/csharp/Grpc.Examples/.gitignore')
-rw-r--r-- | src/csharp/Grpc.Examples/.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/csharp/Grpc.Examples/.gitignore b/src/csharp/Grpc.Examples/.gitignore new file mode 100644 index 0000000000..4795a95b94 --- /dev/null +++ b/src/csharp/Grpc.Examples/.gitignore @@ -0,0 +1,3 @@ +test-results +bin +obj |