+
+Diff:
+
+
+
+
+X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/1626831cc85307682610e58f4bca2a4b7c583024..bf056a7ef4d76f30eb78a7adb4cea576d5969eea:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f63a4b089..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,57 +1,88 @@ - - -
--Your changes conflict with other changes made to the page. -
--Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. -
-" /> |