X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/1d82816082b2a3dee97a1812410962a41f1b6e79..c0b2334815303d4dc2fdf0b22dff12085671c8d8:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index c1e7113b4..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,38 +1,50 @@ - -
-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. -
-