diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-22 19:58:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-22 19:58:34 -0400 |
| commit | d76c10cba24c2bea026facb2a9e5e3215d7f3994 (patch) | |
| tree | 3a35deb647834ae1e00487b4cfef95a7e8921b50 /templates/editconflict.tmpl | |
| parent | 2b9615194e0adefa0f61810405db1e9204ccc72b (diff) | |
| download | ikiwiki-d76c10cba24c2bea026facb2a9e5e3215d7f3994.tar ikiwiki-d76c10cba24c2bea026facb2a9e5e3215d7f3994.tar.gz | |
Split out error messages from editpage.tmpl into several separate templates.
Diffstat (limited to 'templates/editconflict.tmpl')
| -rw-r--r-- | templates/editconflict.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/editconflict.tmpl b/templates/editconflict.tmpl new file mode 100644 index 000000000..125203395 --- /dev/null +++ b/templates/editconflict.tmpl @@ -0,0 +1,7 @@ +<p class="error"> +<b>Your changes conflict with other changes made to the page.</b> +</p> +<p> +Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. +</p> |