+
+Diff:
+
+
+
+
+X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/56d0ceee2e9e324d78ed88d60d7bce108a0b32dd..1226d9f144310876080c077a9c45bd2257829a32:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index b215d9df3..4736c95d0 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,54 +1,91 @@ - - -
--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. -
-" /> |