blob: 2ba59b91533cc2b7eb4b37a0581143516a9f550d (
plain)
1
2
3
4
5
6
7
8
9
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%}
|