X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5591d621b90855beeb5460f0ac11279d19835699..f02df6477ec02e004c44cc6cf298f66c47920b07:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1733483d3..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -2,47 +2,56 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <TMPL_VAR FORM-TITLE> - + + + + +

-Your changes confict with other changes made to the page. +Your changes conflict 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. +conflict and commit again to save your changes.

-

/

+
+/ +
-Page location:
+Page location: +Page type: +
+ -
+
Optional comment about this change:

 - + + -
-