urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

web commit by JeroenSchot: typo.

master
www-data 2006-03-24 23:22:27 +00:00
parent 5b27727ca6
commit 686b62d390
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/features.mdwn
View File

@ -88,7 +88,7 @@ Currently implemented:
Since it uses subversion, ikiwiki takes advantage of its smart merging to
avoid any conflicts when two people edit different parts of the same page
at the same time. No annoying warnings about other editors, or locking,
etc, instead the other person's changes will be automaticaly merged with
etc, instead the other person's changes will be automatically merged with
yours when you commit.
In the rare cases where automatic merging fails due to the same part of a