diff options
| author |  yang-g <yangg@google.com> | 2015-12-02 13:23:33 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-12-02 13:23:33 -0800 |
| commit | d88e1d8f4e42764e17aa2bed3a85b39f68673c03 (patch) | |
| tree | 57cf6860d1c67257ccedc8b762f744e9e4df4a69 /src/core/surface/byte_buffer_reader.c | |
| parent | 768999d0a351e2fd0a691d6391ff767228135123 (diff) | |
| parent | 9fac2afdafe1355b02a355b06955b21d2a2cd004 (diff) | |
merge with head and resolve conflict
Diffstat (limited to 'src/core/surface/byte_buffer_reader.c')
| -rw-r--r-- | src/core/surface/byte_buffer_reader.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/surface/byte_buffer_reader.c b/src/core/surface/byte_buffer_reader.c index 9f830df68c..57417f41b0 100644 --- a/src/core/surface/byte_buffer_reader.c +++ b/src/core/surface/byte_buffer_reader.c @@ -121,4 +121,3 @@ gpr_slice grpc_byte_buffer_reader_readall(grpc_byte_buffer_reader *reader) { } return out_slice; } - |