From 3430ad3ee8218b42995e4dd6b45238067dbafeaf Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Sun, 3 Mar 2013 16:29:48 -0800
Subject: [PATCH] Fixed merge conflicts

---
 NzbDrone.Backbone/Controller.js | 2 +-
 NzbDrone.Backbone/app.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NzbDrone.Backbone/Controller.js b/NzbDrone.Backbone/Controller.js
index ec7cfbf73..738f5bd78 100644
--- a/NzbDrone.Backbone/Controller.js
+++ b/NzbDrone.Backbone/Controller.js
@@ -2,7 +2,7 @@
         'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView',
         'Calendar/CalendarCollectionView', 'Shared/NotificationView',
         'Shared/NotFoundView', 'MainMenuView', 'HeaderView',
-        'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection'],
+        'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
         'Settings/SettingsLayout'],
         function (app, modalRegion) {
 
diff --git a/NzbDrone.Backbone/app.js b/NzbDrone.Backbone/app.js
index f6ecd5235..c33eb31f3 100644
--- a/NzbDrone.Backbone/app.js
+++ b/NzbDrone.Backbone/app.js
@@ -30,7 +30,7 @@ define('app',  function () {
 
     window.NzbDrone = new Backbone.Marionette.Application();
     window.NzbDrone.Series = {};
-        window.NzbDrone.Series.Index = {};
+    window.NzbDrone.Series.Index = {};
     window.NzbDrone.Series.Edit = {};
     window.NzbDrone.Series.Delete = {};
     window.NzbDrone.Series.Details = {};