diff options
Diffstat (limited to 'spec/description.go')
| -rw-r--r-- | spec/description.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/description.go b/spec/description.go index ae56814..e82c509 100644 --- a/spec/description.go +++ b/spec/description.go @@ -44,6 +44,7 @@ type SRConflict struct { Production int `json:"production"` AdoptedState *int `json:"adopted_state"` AdoptedProduction *int `json:"adopted_production"` + ResolvedBy int `json:"resolved_by"` } type RRConflict struct { @@ -51,6 +52,7 @@ type RRConflict struct { Production1 int `json:"production_1"` Production2 int `json:"production_2"` AdoptedProduction int `json:"adopted_production"` + ResolvedBy int `json:"resolved_by"` } type State struct { |