+
+Diff:
+
+
+
+
+X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fa96eab12016e2f29a0a3522f1229039fbbf2c5e..29ac3084bb4ba409ba2ad695690ebcb31497cfed:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index a5c44dc4c..696c8dcad 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,57 +1,88 @@ - - -
--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. -
-" /> |