X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/798c48a1a6ec32274ba031660bdd3eeef462e468..7a9b8abd9232c11622211f4fcc16038a2fc847e6:/templates/editpage.tmpl?ds=inline
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 8b755749f..4724cd65f 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,21 +1,51 @@
+
-<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:
-
+
-Optional comment about this change:
-
+Optional comment about this change:
+
+
+
+
+
+
+
+
+
+