fix merge conflict

jetersen · jetersen · commit a74108a61a8b · 2020-04-09T18:42:40.000+02:00
diff --git a/test/GitLabApiClient.Test/ToDoListClientTest.cs b/test/GitLabApiClient.Test/ToDoListClientTest.cs
@@ -17,7 +17,7 @@ namespace GitLabApiClient.Test
     [Collection("GitLabContainerFixture")]
     public class ToDoListClientTest : IAsyncLifetime
     {
-        private readonly MergeRequestsClient mergeRequestsClient = new MergeRequestsClient(GitLabApiHelper.GetFacade(), new MergeRequestsQueryBuilder(), new ProjectMergeRequestsQueryBuilder());
+        private readonly MergeRequestsClient mergeRequestsClient = new MergeRequestsClient(GitLabApiHelper.GetFacade(), new MergeRequestsQueryBuilder(), new ProjectMergeRequestsQueryBuilder(), new ProjectMergeRequestsNotesQueryBuilder());
         private readonly IssuesClient issuesClient = new IssuesClient(GitLabApiHelper.GetFacade(), new IssuesQueryBuilder(), new ProjectIssueNotesQueryBuilder());
 
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace GitLabApiClient.Test`
`17`	`17`	`[Collection("GitLabContainerFixture")]`
`18`	`18`	`public class ToDoListClientTest : IAsyncLifetime`
`19`	`19`	`{`
`20`		`- private readonly MergeRequestsClient mergeRequestsClient = new MergeRequestsClient(GitLabApiHelper.GetFacade(), new MergeRequestsQueryBuilder(), new ProjectMergeRequestsQueryBuilder());`
	`20`	`+ private readonly MergeRequestsClient mergeRequestsClient = new MergeRequestsClient(GitLabApiHelper.GetFacade(), new MergeRequestsQueryBuilder(), new ProjectMergeRequestsQueryBuilder(), new ProjectMergeRequestsNotesQueryBuilder());`
`21`	`21`	`private readonly IssuesClient issuesClient = new IssuesClient(GitLabApiHelper.GetFacade(), new IssuesQueryBuilder(), new ProjectIssueNotesQueryBuilder());`
`22`	`22`
`23`	`23`