diff options
| author | Lars Wirzenius <liw@liw.fi> | 2020-11-27 11:29:41 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2020-11-27 12:27:35 +0200 |
| commit | 92d8aadbadb5767f41342cd2958b8662ef0b8d96 (patch) | |
| tree | 430ef6d12674a27eca37dbd80f8053f12c5c37d4 /templates/editconflict.tmpl | |
| parent | 193673fa4ca986a8503dded44019f3b0eac30084 (diff) | |
| download | obnam.org-92d8aadbadb5767f41342cd2958b8662ef0b8d96.tar.gz | |
page.tmpl: simplify lots
Drop unnecessary parts. Alwys choose html5.
Diffstat (limited to 'templates/editconflict.tmpl')
| -rw-r--r-- | templates/editconflict.tmpl | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/templates/editconflict.tmpl b/templates/editconflict.tmpl deleted file mode 100644 index 1252033..0000000 --- a/templates/editconflict.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -<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> |