Merge pull request #519 from fpytloun/spelling

Fix spelling error in docs
This commit is contained in:
Markus Unterwaditzer 2016-11-04 12:13:41 +01:00 committed by GitHub
commit e5be554449

View file

@ -42,7 +42,7 @@ program chosen:
This is a good idea if the user is directly interfacing with the file system
and is able to resolve conflicts themselves. Here it might lead to
errorneous behavior with e.g. ``khal``, since there are now two events with
erroneous behavior with e.g. ``khal``, since there are now two events with
the same UID.
This point doesn't apply to git: It has very good merging capabilities,