From 08bd52697e6a0142bdd232c76e76056306787415 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 14 Apr 2013 23:53:18 -0400
Subject: [PATCH] fixing dashboard project

---
 dashboard-ui/scripts/librarybrowser.js | 4 ----
 dashboard-ui/scripts/mediaplayer.js    | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 5dafd972ac..55a6f93cd8 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -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 {
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 449cc92636..a95c03b0ff 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -102,9 +102,7 @@
                 videoBitrate: 1500000,
                 maxWidth: screenWidth,
                 maxHeight: screenHeight,
-                StartTimeTicks: 0,
-                SubtitleStreamIndex: null,
-                AudioStreamIndex: null
+                StartTimeTicks: 0
             };
 
             if (typeof (startPosition) != "undefined") {