diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-12-19 11:48:39 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-12-19 11:48:39 +0200 |
| commit | 8c8e40e01349bf8f2c42a7fae086ed83b9c3d37a (patch) | |
| tree | 4e057467a2d25ccf0089fdf56826623fb824f034 /Software/PMR/Messages/ThreadLoading/ContinueThreadLoadingResponse.proto | |
| parent | 886a476b862f573be5b38036edfe9582946ebe1d (diff) | |
| parent | a61a911d1ebde107ba7bf210af7e753e692d93e2 (diff) | |
| download | Tango-8c8e40e01349bf8f2c42a7fae086ed83b9c3d37a.tar.gz Tango-8c8e40e01349bf8f2c42a7fae086ed83b9c3d37a.zip | |
merge conflict take remot
Diffstat (limited to 'Software/PMR/Messages/ThreadLoading/ContinueThreadLoadingResponse.proto')
| -rw-r--r-- | Software/PMR/Messages/ThreadLoading/ContinueThreadLoadingResponse.proto | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Software/PMR/Messages/ThreadLoading/ContinueThreadLoadingResponse.proto b/Software/PMR/Messages/ThreadLoading/ContinueThreadLoadingResponse.proto index b937fbb34..5763dbb2c 100644 --- a/Software/PMR/Messages/ThreadLoading/ContinueThreadLoadingResponse.proto +++ b/Software/PMR/Messages/ThreadLoading/ContinueThreadLoadingResponse.proto @@ -1,9 +1,12 @@ syntax = "proto3"; +import "ThreadLoadingState.proto"; + package Tango.PMR.ThreadLoading; option java_package = "com.twine.tango.pmr.threadloading"; message ContinueThreadLoadingResponse { - + ThreadLoadingState State = 1; + string ErrorReason = 2; }
\ No newline at end of file |