mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Resolve conflicts

Browse source
This commit is contained in:
MrTimscampi 2020-07-24 10:43:03 +02:00
parent 3713091382
commit 66b107f0c9
26 changed files with 91 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/itemidentifier/itemidentifier.js
View file

@ -240,11 +240,7 @@ import 'cardStyle';
html += '</div>';
html += '</div>';
<<<<<<< HEAD
let numLines = 2;
=======
var numLines = 3;
>>>>>>> upstream/master
let numLines = 3;
if (currentItemType === 'MusicAlbum') {
numLines++;
}