diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-05 21:08:33 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-05 21:08:33 -0700 |
| commit | 27166a6f65581a9ee820882e5d7506d6bd07ade6 (patch) | |
| tree | 0e89c5e09a955b2a074a8b34e0f3fe0a4135f346 /src/objective-c/RxLibrary/transformations/GRXMappingWriter.h | |
| parent | 4efb6966bdfb62c725c6614b0d85ea374250bb51 (diff) | |
| parent | d1dd3a68a2d4af56f1409327c197590dac6968cb (diff) | |
Merge github.com:grpc/grpc into flow-like-lava-to-a-barnyard
Conflicts:
src/core/surface/call.c
src/core/transport/chttp2_transport.c
src/core/transport/transport.h
Diffstat (limited to 'src/objective-c/RxLibrary/transformations/GRXMappingWriter.h')
| -rw-r--r-- | src/objective-c/RxLibrary/transformations/GRXMappingWriter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/objective-c/RxLibrary/transformations/GRXMappingWriter.h b/src/objective-c/RxLibrary/transformations/GRXMappingWriter.h index dcebb6132a..55f6f82f20 100644 --- a/src/objective-c/RxLibrary/transformations/GRXMappingWriter.h +++ b/src/objective-c/RxLibrary/transformations/GRXMappingWriter.h @@ -31,7 +31,7 @@ * */ -#import "GRXWriter.h" +#import "RxLibrary/GRXWriter.h" // A "proxy" writer that transforms all the values of its input writer by using a mapping function. @interface GRXMappingWriter : GRXWriter |