+
+Diff:
+
+
+
+
+X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1452b3adf30145e8fd1208ac73da9d12967863bc..1406b4897fdcdc75f4f23602b77e6a7039748ea0:/templates/editpage.tmpl?ds=inline diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index cf4520575..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,53 +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. -
-