+
+Diff:
+
+
+
+
+X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1452b3adf30145e8fd1208ac73da9d12967863bc..94c1f3bd337f53119d8e28fead322e85f000253e:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index cf4520575..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +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. -
-" /> |