diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-06 22:02:31 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-06 22:02:31 +0000 |
| commit | 92fbaf377ed5c707a2e8ac13de4126930cb2058b (patch) | |
| tree | b9b634cefe3b8a12f29d3fe96c2ed594bdf600f5 /doc | |
| parent | 082f51fc6d8e9232cd97f9d3431272775ba093bc (diff) | |
web commit by JoshTriplett: Plural fix.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tips/issue_tracking.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
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 |