4 lines
113 B
YAML
4 lines
113 B
YAML
|
|
interface:
|
||
|
|
display_name: "Resolving Merge Conflicts"
|
||
|
|
short_description: "Resolve merge and rebase conflicts"
|