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

Fixed merge conflicts

This commit is contained in:
Mark McDowall 2013-03-03 16:29:48 -08:00
parent 50f6ec4fc6
commit 3430ad3ee8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Backbone/Controller.js
View File

@ -2,7 +2,7 @@
'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView', 'Series/Index/SeriesIndexCollectionView', 'Upcoming/UpcomingCollectionView',
'Calendar/CalendarCollectionView', 'Shared/NotificationView', 'Calendar/CalendarCollectionView', 'Shared/NotificationView',
'Shared/NotFoundView', 'MainMenuView', 'HeaderView', 'Shared/NotFoundView', 'MainMenuView', 'HeaderView',
'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection'], 'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
'Settings/SettingsLayout'], 'Settings/SettingsLayout'],
function (app, modalRegion) { function (app, modalRegion) {

2
NzbDrone.Backbone/app.js
View File

@ -30,7 +30,7 @@ define('app', function () {
window.NzbDrone = new Backbone.Marionette.Application(); window.NzbDrone = new Backbone.Marionette.Application();
window.NzbDrone.Series = {}; window.NzbDrone.Series = {};
window.NzbDrone.Series.Index = {}; window.NzbDrone.Series.Index = {};
window.NzbDrone.Series.Edit = {}; window.NzbDrone.Series.Edit = {};
window.NzbDrone.Series.Delete = {}; window.NzbDrone.Series.Delete = {};
window.NzbDrone.Series.Details = {}; window.NzbDrone.Series.Details = {};