diff options
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 1d2afc74de9..68a450e9130 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1259,7 +1259,9 @@ if (firstConflictPath.charAt(0) === '/') { firstConflictPath = firstConflictPath.substr(1); } - $firstConflict.find('td.filename span.innernametext').prepend($('<span></span>').addClass('conflict-path').text(firstConflictPath)); + if (firstConflictPath && firstConflictPath !== '/') { + $firstConflict.find('td.filename span.innernametext').prepend($('<span></span>').addClass('conflict-path').text(firstConflictPath)); + } } var conflictPath = path + '/'; |