mirror of https://github.com/lidarr/Lidarr
Fixed merge conflicts
This commit is contained in:
parent
50f6ec4fc6
commit
3430ad3ee8
|
@ -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) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue