web commit by http://ethan.betacantrips.com/: this part was unrelated, right?

[git.ikiwiki.info.git] / doc / tips / issue_tracking.mdwn

diff --git a/doc/tips/issue_tracking.mdwn b/doc/tips/issue_tracking.mdwn
index 276cfea013b6d83596bc5dd357e2786a01f76bb3..8f08bc692d24a58365ae1e4686d7b41ffebbea6a 100644 (file)
--- a/doc/tips/issue_tracking.mdwn
+++ b/doc/tips/issue_tracking.mdwn
@@ -35,7 +35,7 @@ In the rare cases where automatic merging fails
 because of concurrent edits to the same part of a
 page, regular commit conflict markers are shown in
 the file to let you resolve the conflict, as you
 because of concurrent edits to the same part of a
 page, regular commit conflict markers are shown in
 the file to let you resolve the conflict, as you

-would for conflicting edit in source code.
+would for conflicting edits in source code.

 
 Ikiwiki is a full-featured wiki that you can use
 for a variety of purposes, from traditional wikis
 
 Ikiwiki is a full-featured wiki that you can use
 for a variety of purposes, from traditional wikis