X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/798c48a1a6ec32274ba031660bdd3eeef462e468..42973f687ca3a312303330b0ac50ef618a13381c:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 8b755749f..0bec3d6b2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,21 +1,57 @@ + -<TMPL_VAR FORM-TITLE> + + + +<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. +

+ -

/

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