X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/6b6fd778c7b35961736e9087f56e3872f6d9bdc9..a58c3cfcbfcfc3f6d660642b187e61aa75472e6f:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6ab988261..70bbfb28f 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,36 +1,69 @@ - -
-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. -
-By submitting content to this wiki, you agree to release your work under + the dual license of
+