diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-04-23 18:24:10 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-04-23 18:24:10 +0300 |
| commit | 8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c (patch) | |
| tree | 4efca7fbcdbb241ac3760e372dda75f99638dde0 /Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ContinueThreadLoadingRequest.pb-c.c | |
| parent | f48d6b6714c3115c3b2031e84b85a9fa7442c40f (diff) | |
| parent | 5627d88d6dec269a0b2dcc4538773fe6bbfc767d (diff) | |
| download | Tango-8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c.tar.gz Tango-8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ContinueThreadLoadingRequest.pb-c.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ContinueThreadLoadingRequest.pb-c.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ContinueThreadLoadingRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ContinueThreadLoadingRequest.pb-c.c index 2fc811bf7..532522789 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ContinueThreadLoadingRequest.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ContinueThreadLoadingRequest.pb-c.c @@ -55,7 +55,7 @@ void continue_thread_loading_request__free_unpacked static const ProtobufCFieldDescriptor continue_thread_loading_request__field_descriptors[1] = { { - "ProcessParameters", + "", 1, PROTOBUF_C_LABEL_OPTIONAL, PROTOBUF_C_TYPE_MESSAGE, @@ -78,9 +78,9 @@ static const ProtobufCIntRange continue_thread_loading_request__number_ranges[1 const ProtobufCMessageDescriptor continue_thread_loading_request__descriptor = { PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "ContinueThreadLoadingRequest", - "ContinueThreadLoadingRequest", - "ContinueThreadLoadingRequest", + "", + "", + "", "", sizeof(ContinueThreadLoadingRequest), 1, |