Skip to content

Latest commit

 

History

History
14 lines (6 loc) · 276 Bytes

Conflict.md

File metadata and controls

14 lines (6 loc) · 276 Bytes

Conflict

Properties

Name Type Description Notes
instruction Map<String, Object> [optional]
reason String Reason why the conflict exists [optional]