From 944a2753aa945f4f78e21fb26b29ec6584362ce6 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sun, 4 Oct 2009 21:29:56 +0000 Subject: [PATCH] typo git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31524 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/doc/Additional.lyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.2