Fixing merge error

StanleyGoldman · StanleyGoldman · commit b494b6eaa087 · 2018-10-24T09:38:46.000-04:00
diff --git a/src/GitHub.App/ViewModels/GitHubPane/PullRequestFilesViewModel.cs b/src/GitHub.App/ViewModels/GitHubPane/PullRequestFilesViewModel.cs
@@ -72,7 +72,7 @@ public PullRequestFilesViewModel(
             OpenFirstAnnotationWarning = ReactiveCommand.CreateFromTask<IPullRequestFileNode>(
                 async file => await OpenFirstAnnotation(editorService, file, CheckAnnotationLevel.Warning));
 
-            OpenFirstAnnotationNotice = ReactiveCommand.CreateFromTask<IPullRequestFileNode>(
+            OpenFirstAnnotationFailure = ReactiveCommand.CreateFromTask<IPullRequestFileNode>(
                 async file => await OpenFirstAnnotation(editorService, file, CheckAnnotationLevel.Failure));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public PullRequestFilesViewModel(`
`72`	`72`	`OpenFirstAnnotationWarning = ReactiveCommand.CreateFromTask<IPullRequestFileNode>(`
`73`	`73`	`async file => await OpenFirstAnnotation(editorService, file, CheckAnnotationLevel.Warning));`
`74`	`74`
`75`		`- OpenFirstAnnotationNotice = ReactiveCommand.CreateFromTask<IPullRequestFileNode>(`
	`75`	`+ OpenFirstAnnotationFailure = ReactiveCommand.CreateFromTask<IPullRequestFileNode>(`
`76`	`76`	`async file => await OpenFirstAnnotation(editorService, file, CheckAnnotationLevel.Failure));`
`77`	`77`	`}`
`78`	`78`