diff options
| author |   James Simon <jamsimox@amazon.com> | 2023-03-05 22:34:50 -0500 |
|---|---|---|
| committer | James Simon <jamsimox@amazon.com> | 2023-03-05 22:34:50 -0500 |
| commit | a2a266caea25dd82eb995449ff34099d8fd487b7 (patch) | |
| tree | d716c0e6af4cbf4459b19843866acb8ab8b8905e /build/generated/source/proto/main/cpp/vss/vspec.pb.cc | |
| parent | 58ff36093cb20fc7d3454a423975fe1479538372 (diff) | |
| parent | 4167b134485cabd6a9e19564baa130146183cfb8 (diff) | |
Resolve merge conflicts 1
Signed-off-by: James Simon <jamsimox@amazon.com>
Change-Id: I414d87b42e6a1182f7ad439a28284efde2c607e0
Diffstat (limited to 'build/generated/source/proto/main/cpp/vss/vspec.pb.cc')
| -rw-r--r-- | build/generated/source/proto/main/cpp/vss/vspec.pb.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/build/generated/source/proto/main/cpp/vss/vspec.pb.cc b/build/generated/source/proto/main/cpp/vss/vspec.pb.cc index 356a4a3..61ac97c 100644 --- a/build/generated/source/proto/main/cpp/vss/vspec.pb.cc +++ b/build/generated/source/proto/main/cpp/vss/vspec.pb.cc @@ -10592,13 +10592,22 @@ const char descriptor_table_protodef_vss_2fvspec_2eproto[] PROTOBUF_SECTION_VARI "icleService\022\024\n\014IsServiceDue\030\001 \001(\010\022\031\n\021Dis" "tanceToService\030\002 \001(\002\022\025\n\rTimeToService\030\003 " "\001(\005\"6\n\023VehicleConnectivity\022\037\n\027IsConnecti" +<<<<<<< HEAD "vityAvailable\030\001 \001(\010b\006proto3" +======= + "vityAvailable\030\001 \001(\010B\021\n\017com.vehicle.vssb\006" + "proto3" +>>>>>>> 4167b134485cabd6a9e19564baa130146183cfb8 }; static ::absl::once_flag descriptor_table_vss_2fvspec_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_vss_2fvspec_2eproto = { false, false, +<<<<<<< HEAD 42027, +======= + 42046, +>>>>>>> 4167b134485cabd6a9e19564baa130146183cfb8 descriptor_table_protodef_vss_2fvspec_2eproto, "vss/vspec.proto", &descriptor_table_vss_2fvspec_2eproto_once, |