diff options
| author |  Vladimir Moskva <vladmos@google.com> | 2016-09-12 11:27:28 +0200 |
|---|---|---|
| committer | Vladimir Moskva <vladmos@google.com> | 2016-09-12 11:27:28 +0200 |
| commit | 5caf516976f4c3a9cc7b5191404cf04c7998627f (patch) | |
| tree | 6b74f54f98feed9841ace1471d7545f5b13902b1 /objectivec/google/protobuf/Duration.pbobjc.h | |
| parent | a86e6d8db22774855489892b65e3fd49a1277922 (diff) | |
| parent | 78aee1b15f49375d279071a5367b6281ce93f8aa (diff) | |
Resolved a conflict
Diffstat (limited to 'objectivec/google/protobuf/Duration.pbobjc.h')
| -rw-r--r-- | objectivec/google/protobuf/Duration.pbobjc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/objectivec/google/protobuf/Duration.pbobjc.h b/objectivec/google/protobuf/Duration.pbobjc.h index fa91e223..090eb002 100644 --- a/objectivec/google/protobuf/Duration.pbobjc.h +++ b/objectivec/google/protobuf/Duration.pbobjc.h @@ -13,7 +13,7 @@ #import "GPBProtocolBuffers.h" #endif -#if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30001 +#if GOOGLE_PROTOBUF_OBJC_GEN_VERSION != 30002 #error This file was generated by a different version of protoc which is incompatible with your Protocol Buffer library sources. #endif |