[phpwiki-checkins] CVS: phpwiki/lib editpage.php,1.44,1.45

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv28192

Modified Files:
	editpage.php 
Log Message:
bugfix

Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -2 -b -p -d -r1.44 -r1.45
--- editpage.php	23 Feb 2002 05:53:14 -0000	1.44
+++ editpage.php	23 Feb 2002 07:01:56 -0000	1.45
@@ -243,7 +243,7 @@ class PageEditor
 
         if ($unresolved)
-            $message =  HTML::p(fmt("Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save."),
+            $message =  HTML::p(fmt("Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save.",
                                 "<<<<<<< ". _("Your version"),
-                                ">>>>>>> . _("Other version"));
+                                ">>>>>>> ". _("Other version")));
         else
             $message = HTML::p(_("Please check it through before saving."));