diff options
author | 2018-01-09 12:57:21 -0800 | |
---|---|---|
committer | 2018-01-09 12:57:21 -0800 | |
commit | aa00c7444982de08b21604965a708d1cad5188f7 (patch) | |
tree | 166325a14805321cbf5045fdd4a52dd634747218 /Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m | |
parent | 2c6682c66ea7b86b3b7cb52e623086b4184d500a (diff) | |
parent | c18af34fca72b5721cab4e3b26da7469df8fcc6b (diff) |
Merge branch 'master' into mikelehen/merge-master-to-firestore-api-changes
Diffstat (limited to 'Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m')
-rw-r--r-- | Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m b/Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m index 118f56e..3775d73 100644 --- a/Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m +++ b/Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.m @@ -32,11 +32,11 @@ #if GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS #import <Protobuf/Timestamp.pbobjc.h> #else - #import "Timestamp.pbobjc.h" + #import "Firestore/Protos/objc/google/protobuf/Timestamp.pbobjc.h" #endif - #import "Common.pbobjc.h" - #import "Annotations.pbobjc.h" + #import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h" + #import "Firestore/Protos/objc/google/api/Annotations.pbobjc.h" // @@protoc_insertion_point(imports) #pragma clang diagnostic push |