diff options
| author | Adam Cozzette <acozzette@gmail.com> | 2018-08-01 14:56:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 14:56:08 -0700 |
| commit | 21fc01b63c7f60bae4e230c817a82bd8571a4a70 (patch) | |
| tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /src/google/protobuf/duration.pb.h | |
| parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
| parent | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (diff) | |
| download | protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.tar.gz protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.tar.bz2 protobuf-21fc01b63c7f60bae4e230c817a82bd8571a4a70.zip | |
Merge pull request #4991 from acozzette/merge-3-6-x
Merge 3.6.x branch into master
Diffstat (limited to 'src/google/protobuf/duration.pb.h')
| -rw-r--r-- | src/google/protobuf/duration.pb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 751edbef..19241ebc 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -8,12 +8,12 @@ #include <google/protobuf/stubs/common.h> -#if GOOGLE_PROTOBUF_VERSION < 3006000 +#if GOOGLE_PROTOBUF_VERSION < 3006001 #error This file was generated by a newer version of protoc which is #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION +#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION #error This file was generated by an older version of protoc which is #error incompatible with your Protocol Buffer headers. Please #error regenerate this file with a newer version of protoc. |