X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=d6ad8061420f2c8056b6c1d12f3da6223ba0582f;hp=6ab9882618d2c843bb462b8b4618c06dd5ee513c;hb=7988a5aee3be9fe82da1d47d2a72c95eabc7bb6e;hpb=6b6fd778c7b35961736e9087f56e3872f6d9bdc9 diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6ab988261..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,36 +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. -
-