X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fb670513bf2372a6a88e5a5bc15eacfe4b88bf35..ac2a5594a186d5a2a3094a96ac440934312d6964:/templates/editpage.tmpl?ds=sidebyside
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 6030fa2c1..4b54db2d1 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,33 +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:
@@ -43,15 +22,28 @@ Optional comment about this change:
+
+Attachments
+
+
+
-