fixed merge conflicts

NzbDrone.Backbone/NzbDrone.Backbone.csproj

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

NzbDrone.Web/NzbDrone.Web.csproj

@@ -270,49 +270,6 @@
     <Compile Include="Models\UpcomingEpisodeModel.cs" />
     <Compile Include="Models\UpdateModel.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="Views\System\Index.cshtml" />
     <Content Include="Views\System\Logs.cshtml" />
@@ -530,7 +487,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="_backboneApp\Upcoming\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Autofac.Integration.Mvc\Autofac.Integration.Mvc.csproj">
@@ -720,4 +676,4 @@
 xcopy /s /y "$(SolutionDir)\SqlCe\*.*"   "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-</Project>
+</Project>