diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-19 10:57:47 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-19 10:57:47 -0500 |
| commit | b51ea9e4fa0444c7a75d8a5154a08081891a1e53 (patch) | |
| tree | 94c0e4282de5964f4f5b146186351e4fe2a8572f | |
| parent | 5963affec5b492d4859017cfd9352dfd683b3795 (diff) | |
fix merge conflict
| -rw-r--r-- | MediaBrowser.sln | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/MediaBrowser.sln b/MediaBrowser.sln index a9b5020ec..d0fbd743e 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 |