fixing dashboard project

2013-04-14 23:53:18 -04:00
parent 02316a115f
commit 08bd52697e
2 changed files with 1 additions and 7 deletions
@@ -81,11 +81,7 @@
                }
                else if (item.MediaType == "Game") {

-<<<<<<< HEAD
-	                html += "<img class='posterDetailViewImage' style='background:" + LibraryBrowser.getMetroColor(item.Id) + ";' src='css/images/items/list/game.png' />";
-=======
                    html += "<img class='posterDetailViewImage' style='background:" + LibraryBrowser.getMetroColor(item.Id) + ";' src='css/images/items/list/game.png' />";
->>>>>>> 103dcc97e4c89de41919ec2ab1025f8df30e87fb
                }
                else {

@@ -102,9 +102,7 @@
                videoBitrate: 1500000,
                maxWidth: screenWidth,
                maxHeight: screenHeight,
-                StartTimeTicks: 0,
-                SubtitleStreamIndex: null,
-                AudioStreamIndex: null
+                StartTimeTicks: 0
            };

            if (typeof (startPosition) != "undefined") {