typo

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31524 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index 9764dd97628aaca73028fc3505a20f3ee29bdb6d..18586a9b237bb9b248f771c0113392928b9993a1 100644 (file)
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -18511,7 +18511,7 @@ Check Out For Edit
 \begin_layout Standard
 Updates the changes of this file from the repository.
  Be sure you understand SVN merging and conflicts resolving before using
- this function, because all conflicts has to be done manually by you!
+ this function, because all conflicts has to be resolved manually by you!
 \end_layout
 
 \begin_layout Standard