Sign in
gerrit
/
gerrit-attic
/
38966837f9f0b331b3cafa3dccb8b41f8c42c671
/
.
/
webapp
/
templates
/
mails
/
path_conflict.txt
blob: 2ba59b91533cc2b7eb4b37a0581143516a9f550d [
file
] [
log
] [
blame
]
{%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%}