+
+Diff:
+
+
+
+
+X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/96eb9bb3fa1d805df967f44d13876f57b8ea121d..c7c43cccbabc74f2623ffb7b49674b753562f80d:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index ad1faa3a5..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,57 +1,88 @@ - - -
--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. -
-" /> |