X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/cf3021ef3f5cb839195585d601de76df519da510..1b8989953440d444fed2f4b395e9e911a637ed79:/templates/editpage.tmpl
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 27155f5cf..b1cf015a2 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,29 +1,12 @@
-
-
-
-
-
-<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 type:
@@ -39,15 +22,29 @@ Optional comment about this change:
+
+Attachments
+
+
+
+
-