X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;ds=sidebyside;f=templates%2Feditpage.tmpl;h=36076cb3534bfb269e2cb174784be90ceee88deb;hb=23aaa5ac45f389a741afdac6d87e077a2e44fe8b;hp=b7ec3fa2b18277abaf4d816e268f8d8e6ba2c6d6;hpb=5466a1daf99e8e4c67a19f871aaf558312569652;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index b7ec3fa2b..36076cb35 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +1,67 @@ - - - - - - - -<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:
    +
  1. + + +
    2. +     -
    +
  2. +
    +
    +
    +
    3. -Optional comment about this change:
    +
  3. +
    +
    4.  +
+ + +Attachments +
+ + + + + + + + +
+
+ -
+ + -