+
+Diff:
+
+
+
+
+X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/1452b3adf30145e8fd1208ac73da9d12967863bc..2b1bc9c7297dc4bf36f4fc91205ad13eaf1513ca:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index cf4520575..118ca4550 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +1,65 @@ - - -
--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. -
-