diff options
Diffstat (limited to 'sam/errors/conflict.cmd')
| -rw-r--r-- | sam/errors/conflict.cmd | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sam/errors/conflict.cmd b/sam/errors/conflict.cmd new file mode 100644 index 0000000..8397024 --- /dev/null +++ b/sam/errors/conflict.cmd @@ -0,0 +1,4 @@ +,{ +c/text1/ +c/text2/ +} |