X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1d82816082b2a3dee97a1812410962a41f1b6e79..d564e3252a549c5de9359eddedffb8fe16b0cf45:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c1e7113b4..f63a4b089 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,38 +1,57 @@ + -<TMPL_VAR FORM-TITLE> + + + +<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:
-
+Optional comment about this change:
+
 - + + -
-

Page preview:

+
+
+Page preview: +
+
- - +