diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2015-06-24 13:45:59 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2015-06-24 13:45:59 -0700 |
| commit | 03d26b5fe297fe42891c026cc92266ea7512760e (patch) | |
| tree | 4c94437346341bab063af8be2a37d2cfbb83eee2 /src/objective-c/RxLibrary/transformations/GRXMappingWriter.h | |
| parent | 8c1fd042e4e9c7ce719118d1958f22550a236fb0 (diff) | |
| parent | 66daf23401dd96b3fc6097738b7abfa8a43b709a (diff) | |
Merge master into bazel-grpc-unsecured to solve conflict
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 |