mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed merge conflicts

This commit is contained in:
kay.one 2013-02-17 18:16:31 -08:00
parent 7093f352fe
commit 10ef709a3c
3 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NzbDrone.Backbone/NzbDrone.Backbone.csproj
View File

@ -118,6 +118,7 @@
<Content Include="Series\Delete\DeleteSeriesView.js" /> <Content Include="Series\Delete\DeleteSeriesView.js" />
<Content Include="Series\Edit\EditSeriesTemplate.html" /> <Content Include="Series\Edit\EditSeriesTemplate.html" />
<Content Include="Series\Edit\EditSeriesView.js" /> <Content Include="Series\Edit\EditSeriesView.js" />
<Content Include="Series\EmptySeriesCollectionTemplate.html" />
<Content Include="Series\SeriesCollection.js" /> <Content Include="Series\SeriesCollection.js" />
<Content Include="Series\SeriesCollectionTemplate.html" /> <Content Include="Series\SeriesCollectionTemplate.html" />
<Content Include="Series\SeriesCollectionView.js" /> <Content Include="Series\SeriesCollectionView.js" />
@ -269,8 +270,6 @@
<WebProjectProperties> <WebProjectProperties>
<UseIIS>False</UseIIS> <UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort> <AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerPort>55352</DevelopmentServerPort>
<DevelopmentServerPort>14256</DevelopmentServerPort> <DevelopmentServerPort>14256</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath> <DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:55352/</IISUrl> <IISUrl>http://localhost:55352/</IISUrl>

0
NzbDrone.Web/_backboneApp/Series/EmptySeriesCollectionTemplate.html → NzbDrone.Backbone/Series/EmptySeriesCollectionTemplate.html
View File

44
NzbDrone.Web/NzbDrone.Web.csproj
View File

@ -270,49 +270,6 @@
<Compile Include="Models\UpcomingEpisodeModel.cs" /> <Compile Include="Models\UpcomingEpisodeModel.cs" />
<Compile Include="Models\UpdateModel.cs" /> <Compile Include="Models\UpdateModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Content Include="_backboneApp\JsLibraries\backbone.js" />
<Content Include="_backboneApp\JsLibraries\backbone.marionette.js" />
<Content Include="_backboneApp\AddSeries\addSeriesLayoutTemplate.html" />
<Content Include="_backboneApp\Series\SeriesCollectionView.js" />
<Content Include="_backboneApp\Series\Edit\EditSeriesTemplate.html" />
<Content Include="_backboneApp\Series\Edit\EditSeriesView.js" />
<Content Include="_backboneApp\Shared\NotificationCollection.js" />
<Content Include="_backboneApp\Shared\ModalRegion.js" />
<Content Include="_backboneApp\Series\Delete\DeleteSeriesTemplate.html" />
<Content Include="_backboneApp\Series\SeriesCollectionTemplate.html" />
<Content Include="_backboneApp\Series\SeriesItemTemplate.html" />
<Content Include="_backboneApp\Series\SeriesItemView.js" />
<Content Include="_backboneApp\Series\SeriesCollection.js" />
<Content Include="_backboneApp\Series\Delete\DeleteSeriesView.js" />
<Content Include="_backboneApp\Series\SeriesModel.js" />
<Content Include="_backboneApp\Shared\AutoComplete.js" />
<Content Include="_backboneApp\Shared\NotificationModel.js" />
<Content Include="_backboneApp\Shared\NotificationTemplate.html" />
<Content Include="_backboneApp\Shared\NotificationView.js" />
<Content Include="_backboneApp\Shared\SpinnerTemplate.html" />
<Content Include="_backboneApp\Shared\SpinnerView.js" />
<Content Include="_backboneApp\JsLibraries\backbone.js" />
<Content Include="_backboneApp\JsLibraries\backbone.marionette.js" />
<Content Include="_backboneApp\AddSeries\addSeriesLayoutTemplate.html" />
<Content Include="_backboneApp\Series\EmptySeriesCollectionTemplate.html" />
<Content Include="_backboneApp\Series\SeriesCollectionView.js" />
<Content Include="_backboneApp\Series\Edit\EditSeriesTemplate.html" />
<Content Include="_backboneApp\Series\Edit\EditSeriesView.js" />
<Content Include="_backboneApp\Shared\NotificationCollection.js" />
<Content Include="_backboneApp\Shared\ModalRegion.js" />
<Content Include="_backboneApp\Series\Delete\DeleteSeriesTemplate.html" />
<Content Include="_backboneApp\Series\SeriesCollectionTemplate.html" />
<Content Include="_backboneApp\Series\SeriesItemTemplate.html" />
<Content Include="_backboneApp\Series\SeriesItemView.js" />
<Content Include="_backboneApp\Series\SeriesCollection.js" />
<Content Include="_backboneApp\Series\Delete\DeleteSeriesView.js" />
<Content Include="_backboneApp\Series\SeriesModel.js" />
<Content Include="_backboneApp\Shared\AutoComplete.js" />
<Content Include="_backboneApp\Shared\NotificationModel.js" />
<Content Include="_backboneApp\Shared\NotificationTemplate.html" />
<Content Include="_backboneApp\Shared\NotificationView.js" />
<Content Include="_backboneApp\Shared\SpinnerTemplate.html" />
<Content Include="_backboneApp\Shared\SpinnerView.js" />
<Content Include="ClassDiagram1.cd" /> <Content Include="ClassDiagram1.cd" />
<Content Include="Views\System\Index.cshtml" /> <Content Include="Views\System\Index.cshtml" />
<Content Include="Views\System\Logs.cshtml" /> <Content Include="Views\System\Logs.cshtml" />
@ -530,7 +487,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
<Folder Include="_backboneApp\Upcoming\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Autofac.Integration.Mvc\Autofac.Integration.Mvc.csproj"> <ProjectReference Include="..\Autofac.Integration.Mvc\Autofac.Integration.Mvc.csproj">