diff options
| author | root <root@piny.svcs.cs.pdx.edu> | 2009-09-06 04:26:13 -0700 |
|---|---|---|
| committer | root <root@piny.svcs.cs.pdx.edu> | 2009-09-06 04:26:13 -0700 |
| commit | 29355a1653a12742928ce563e4c077a77f67c9f9 (patch) | |
| tree | a502a34c06c33c08cfb8050527e2c7ae5ceb47ad /srv/templates/editconflict.tmpl | |
| parent | 3d47e7f272d128780a2c6c5d94e4c61d7888c3d1 (diff) | |
| download | piny-code-29355a1653a12742928ce563e4c077a77f67c9f9.tar.gz piny-code-29355a1653a12742928ce563e4c077a77f67c9f9.zip | |
Import of unversioned piny code.
Diffstat (limited to 'srv/templates/editconflict.tmpl')
| -rw-r--r-- | srv/templates/editconflict.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/srv/templates/editconflict.tmpl b/srv/templates/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/srv/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> |