summaryrefslogtreecommitdiff
path: root/docs/html/development/contributing.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/development/contributing.rst')
-rw-r--r--docs/html/development/contributing.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/development/contributing.rst b/docs/html/development/contributing.rst
index 85485dc17..a82420da4 100644
--- a/docs/html/development/contributing.rst
+++ b/docs/html/development/contributing.rst
@@ -248,7 +248,7 @@ and they will initiate a vote among the existing maintainers.
- ReadTheDocs Administration capabilities
.. _`Studies have shown`: https://www.kessler.de/prd/smartbear/BestPracticesForPeerCodeReview.pdf
-.. _`resolve merge conflicts`: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
+.. _`resolve merge conflicts`: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line
.. _`Travis CI`: https://travis-ci.org/
.. _`Appveyor CI`: https://www.appveyor.com/
.. _`.travis.yml`: https://github.com/pypa/pip/blob/master/.travis.yml