Skip to content

Commit 4a7f065

Browse files
committed
merge issue fix
1 parent cd5f8d0 commit 4a7f065

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

samples/MvvmSampleUwp/App.xaml.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,24 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
4141
TitleBarHelper.StyleTitleBar();
4242
TitleBarHelper.ExpandViewIntoTitleBar();
4343

44-
// Register services
45-
Ioc.Default.ConfigureServices(
46-
new ServiceCollection()
47-
//Services
48-
.AddSingleton<IFilesService, FilesService>()
49-
.AddSingleton<ISettingsService, SettingsService>()
50-
.AddSingleton(RestService.For<IRedditService>("https://www.reddit.com/"))
51-
//ViewModels
52-
.AddTransient<PostWidgetViewModel>()
53-
.AddTransient<SubredditWidgetViewModel>()
54-
.AddTransient<AsyncRelayCommandPageViewModel>()
55-
.AddTransient<IocPageViewModel>()
56-
.AddTransient<MessengerPageViewModel>()
57-
.AddTransient<ObservableObjectPageViewModel>()
58-
.AddTransient<RelayCommandPageViewModel>()
59-
.AddTransient<SamplePageViewModel>()
60-
.BuildServiceProvider());
61-
}
44+
// Register services
45+
Ioc.Default.ConfigureServices(
46+
new ServiceCollection()
47+
//Services
48+
.AddSingleton<IFilesService, FilesService>()
49+
.AddSingleton<ISettingsService, SettingsService>()
50+
.AddSingleton(RestService.For<IRedditService>("https://www.reddit.com/"))
51+
//ViewModels
52+
.AddTransient<PostWidgetViewModel>()
53+
.AddTransient<SubredditWidgetViewModel>()
54+
.AddTransient<AsyncRelayCommandPageViewModel>()
55+
.AddTransient<IocPageViewModel>()
56+
.AddTransient<MessengerPageViewModel>()
57+
.AddTransient<ObservableObjectPageViewModel>()
58+
.AddTransient<RelayCommandPageViewModel>()
59+
.AddTransient<SamplePageViewModel>()
60+
.BuildServiceProvider());
61+
}
6262

6363
// Enable the prelaunch if needed, and activate the window
6464
if (e.PrelaunchActivated == false)

0 commit comments

Comments
 (0)