From 0f5c30198eae1777262aaa6c65d8b59875049beb Mon Sep 17 00:00:00 2001 From: Ryo Nihei Date: Fri, 22 Apr 2022 00:06:40 +0900 Subject: Suppress a report about conflicts resolved explicitly --- spec/description.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'spec') 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 { -- cgit v1.2.3