summaryrefslogtreecommitdiffstats
path: root/apps/files/templates/fileexists.html
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-09-18 17:22:29 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-09-18 17:22:29 +0200
commit7bd5e89f8cf6e46daa45e588d9275728b93a230e (patch)
treedb8885541d4db473d5dbc8df86520c2aea15153c /apps/files/templates/fileexists.html
parent12ff268e607738b03125ec6b212708391496d7f5 (diff)
downloadnextcloud-server-7bd5e89f8cf6e46daa45e588d9275728b93a230e.tar.gz
nextcloud-server-7bd5e89f8cf6e46daa45e588d9275728b93a230e.zip
simplify conflict template handling, fix reopen after ESC
Diffstat (limited to 'apps/files/templates/fileexists.html')
-rw-r--r--apps/files/templates/fileexists.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html
index a5b2fb76908..662177ac7ed 100644
--- a/apps/files/templates/fileexists.html
+++ b/apps/files/templates/fileexists.html
@@ -7,7 +7,7 @@
<th><label><input class="allexistingfiles" type="checkbox" />Already existing files<span class="count"></span></label></th>
</table>
<div class="conflicts">
- <div class="conflict template">
+ <div class="template">
<div class="filename"></div>
<div class="replacement">
<input type="checkbox" />