Merge pull request #353 from hobarrera/conflicts-link

Fix broken link to conflict documentation
This commit is contained in:
Markus Unterwaditzer 2016-03-02 15:54:37 +01:00
commit 767566b48b

View file

@ -97,7 +97,7 @@ def handle_cli_error(status_name=None):
'{status_name}: One item changed on both sides. Resolve this '
'conflict manually, or by setting the `conflict_resolution` '
'parameter in your config file.\n'
'See also {docs}/api.html#pair-section\n'
'See also {docs}/config.html#pair-section\n'
'Item ID: {e.ident}\n'
'Item href on side A: {e.href_a}\n'
'Item href on side B: {e.href_b}\n'