diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 14:22:55 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 14:22:55 -0500 |
| commit | 4b11e3e0d8aca93da7132d10a37a4139f75d713f (patch) | |
| tree | 15241c9950969918f19abd1cc2e4df5f1885e312 /MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj | |
| parent | 6a9d71db10cc117076706e8d0c996fb831164d24 (diff) | |
fix merge conflicts
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj')
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index c842e28b64..24670aedf7 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -52,8 +52,7 @@ <SpecificVersion>False</SpecificVersion> <HintPath>..\packages\MediaBrowser.Naming.1.0.0.41\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath> </Reference> - <Reference Include="MoreLinq, Version=1.4.18916.0, Culture=neutral, PublicKeyToken=384d532d7e88985d, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> + <Reference Include="MoreLinq"> <HintPath>..\packages\morelinq.1.4.0\lib\net35\MoreLinq.dll</HintPath> </Reference> <Reference Include="Patterns.Logging"> @@ -122,9 +121,9 @@ <Compile Include="Connect\ConnectManager.cs" /> <Compile Include="Connect\Responses.cs" /> <Compile Include="Connect\Validator.cs" /> - <Compile Include="Devices\CameraUploadsFolder.cs" /> <Compile Include="Devices\DeviceManager.cs" /> <Compile Include="Devices\DeviceRepository.cs" /> + <Compile Include="Devices\CameraUploadsFolder.cs" /> <Compile Include="Dto\DtoService.cs" /> <Compile Include="EntryPoints\ActivityLogEntryPoint.cs" /> <Compile Include="EntryPoints\AutomaticRestartEntryPoint.cs" /> |