From 3c239b14bc84e33535cb8980fcdcf8ab5d1022eb Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 19 Mar 2006 19:09:57 +0000 Subject: first cut at svn merge and conflict --- templates/editpage.tmpl | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'templates/editpage.tmpl') diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index d02eaad70..6aa9ecd1c 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,6 +1,13 @@ <TMPL_VAR FORM-TITLE> + +

+Your changes confict with other changes made to the page. +Conflict markers have been inserted into the page content. Reconcile the +confict and commit again to save your changes. +

/

-- cgit v1.2.3