diff options
Diffstat (limited to 'webapp/templates/mails/path_conflict.txt')
| -rw-r--r-- | webapp/templates/mails/path_conflict.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/webapp/templates/mails/path_conflict.txt b/webapp/templates/mails/path_conflict.txt new file mode 100644 index 0000000000..2ba59b9153 --- /dev/null +++ b/webapp/templates/mails/path_conflict.txt @@ -0,0 +1,10 @@ +{%autoescape off%} +Hi. + +Your change has not been successfully merged into the git repository. + +You need to resolve the following files before it can be submitted: + +-Your friendly git merger + +{%endautoescape%} |