Resolving merge problem

kevwhitt-hee · kevwhitt-hee · commit 28f843b06848 · 2024-12-19T11:57:14.000Z
diff --git a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs
@@ -410,7 +410,7 @@ public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int del
         }
         public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId)
         {
-            return selfAssessmentDataService.GetSelfAssessmentsForCandidate(delegateUserId, centreId, adminCategoryId);
+            return selfAssessmentDataService.GetSelfAssessmentsForCandidate(delegateUserId, centreId);
         }
         public IEnumerable<Competency> GetMostRecentResults(int selfAssessmentId, int delegateId)
         {

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int del`
`410`	`410`	`}`
`411`	`411`	`public IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId)`
`412`	`412`	`{`
`413`		`- return selfAssessmentDataService.GetSelfAssessmentsForCandidate(delegateUserId, centreId, adminCategoryId);`
	`413`	`+ return selfAssessmentDataService.GetSelfAssessmentsForCandidate(delegateUserId, centreId);`
`414`	`414`	`}`
`415`	`415`	`public IEnumerable<Competency> GetMostRecentResults(int selfAssessmentId, int delegateId)`
`416`	`416`	`{`