From 9843f16ebd2d794f9263edc5909d7decd80e62eb Mon Sep 17 00:00:00 2001
From: carstenklapp <carstenklapp@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 23 Feb 2002 05:04:04 +0000
Subject: [PATCH] typo

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@2169 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/editpage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editpage.php b/lib/editpage.php
index 5f0bf8f2d..96afc070a 100644
--- a/lib/editpage.php
+++ b/lib/editpage.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: editpage.php,v 1.42 2002-02-18 08:48:18 carstenklapp Exp $');
+rcs_id('$Id: editpage.php,v 1.43 2002-02-23 05:04:04 carstenklapp Exp $');
 
 require_once('lib/Template.php');
 
@@ -242,7 +242,7 @@ class PageEditor
 //        $re_edit_link = Button('edit', _("Edit the new version"), $this->page);
 
 		if ($unresolved )
-		        $message =  HTML::p(_("Some of the changes could not automatically be combined.  Please look for sections beginning with <<<<<<< Your version, and ending with >>>>>>> Other version.  You will need to edit those sections by hand, and the click Save"));
+		        $message =  HTML::p(_("Some of the changes could not automatically be combined.  Please look for sections beginning with '<<<<<<< Your version', and ending with '>>>>>>> Other version'.  You will need to edit those sections by hand, and then click Save."));
         else
 		        $message = HTML::p(_("Please check it through and click Save to save it."));
 				
-- 
2.45.0