+
+Diff:
+
+
+
+
+X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/5591d621b90855beeb5460f0ac11279d19835699..b45688e34e25a596dc19f6a2b94f3f342041da1e:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1733483d3..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,48 +1,60 @@ - - -
- --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. -
-