diff options
author | Bogdan Drutu <bdrutu@google.com> | 2016-01-14 17:57:50 -0800 |
---|---|---|
committer | Bogdan Drutu <bdrutu@google.com> | 2016-01-14 17:57:50 -0800 |
commit | 0277270b3a9ea52c4323cae79cee664a7652c41b (patch) | |
tree | f3c81cd3b3690328e82cd235681c1a22d88400da /include/grpc++/support/slice.h | |
parent | 5200df6bcb5089ababf679f6bf02de6c3d793e90 (diff) | |
parent | 7df646667d40390e691616838d35e3e52cdd18c9 (diff) |
Merge remote-tracking branch 'upstream/master' into bug
Diffstat (limited to 'include/grpc++/support/slice.h')
-rw-r--r-- | include/grpc++/support/slice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/grpc++/support/slice.h b/include/grpc++/support/slice.h index 30325ef90b..724691a033 100644 --- a/include/grpc++/support/slice.h +++ b/include/grpc++/support/slice.h @@ -85,4 +85,4 @@ class Slice GRPC_FINAL { } // namespace grpc -#endif // GRPCXX_SUPPORT_SLICE_H
\ No newline at end of file +#endif // GRPCXX_SUPPORT_SLICE_H |