From: Pavel Sanda <sanda@lyx.org>
Date: Sun, 4 Oct 2009 21:29:56 +0000 (+0000)
Subject: typo
X-Git-Tag: 2.0.0~5416
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=944a2753aa945f4f78e21fb26b29ec6584362ce6;p=features.git

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 9764dd9762..18586a9b23 100644
--- 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