+
+Diff:
+
+
+
+
+X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c4e0e8c36c89fa26e76bb21dbdb8263ee88d5143..047d2c12e58e7871328fe1f114e865b7efdb487a:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 4724cd65f..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,51 +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. -
-" /> |