From b51ea9e4fa0444c7a75d8a5154a08081891a1e53 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 19 Dec 2015 10:57:47 -0500
Subject: [PATCH] fix merge conflict

---
 MediaBrowser.sln | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index a9b5020ec2..d0fbd743ee 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Performance2.psess = Performance2.psess
 		Performance3.psess = Performance3.psess
 		Performance4.psess = Performance4.psess
-		Performance5.psess = Performance5.psess
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget (2)", ".nuget (2)", "{E60FB157-87E2-4A41-8B04-27EA49B63B4D}"
@@ -521,7 +520,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 EndGlobal