From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 6 Apr 2007 22:02:31 +0000 (+0000)
Subject: web commit by JoshTriplett: Plural fix.
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/92fbaf377ed5c707a2e8ac13de4126930cb2058b

web commit by JoshTriplett: Plural fix.
---

diff --git a/doc/tips/issue_tracking.mdwn b/doc/tips/issue_tracking.mdwn
index 276cfea01..8f08bc692 100644
--- 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
-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