diff options
| author | Karl Semich <0xloem@gmail.com> | 2016-08-27 04:31:52 -0400 |
|---|---|---|
| committer | Karl Semich <0xloem@gmail.com> | 2016-08-27 04:31:52 -0400 |
| commit | 6945074c2c496a89665f559d431cf22602199937 (patch) | |
| tree | dd76fa29e557aaaaf11a40d5595a22a996533f41 /backend/ikistrap/templates/editconflict.tmpl | |
| parent | 227d6118cf72cf9333ac2488b76633f346e59425 (diff) | |
| download | standingwithresilience-6945074c2c496a89665f559d431cf22602199937.tar.gz standingwithresilience-6945074c2c496a89665f559d431cf22602199937.zip | |
Added ikistrap template
Diffstat (limited to 'backend/ikistrap/templates/editconflict.tmpl')
| -rw-r--r-- | backend/ikistrap/templates/editconflict.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/backend/ikistrap/templates/editconflict.tmpl b/backend/ikistrap/templates/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/backend/ikistrap/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> |