alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-06 07:48:50 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Luke Pulverenti
2015-12-27 14:22:55 -05:00
parent 6a9d71db10
commit 4b11e3e0d8
6 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
View File

@@ -54,8 +54,7 @@
<Reference Include="MoreLinq">
<HintPath>..\packages\morelinq.1.4.0\lib\net35\MoreLinq.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="NLog">
<HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="Patterns.Logging">
@@ -65,8 +64,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="SimpleInjector, Version=3.1.2.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="SimpleInjector">
<HintPath>..\packages\SimpleInjector.3.1.2\lib\net45\SimpleInjector.dll</HintPath>
</Reference>
<Reference Include="System" />