Fixed merge conflicts

12 years ago · 3430ad3ee8
parent 50f6ec4fc6
commit 3430ad3ee8
2 changed files with 2 additions and 2 deletions
--- 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) {

--- 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 = {};