TD-5563 Reslving the merge conflict

sherif-olaboye · sherif-olaboye · commit bc4ee7eacb4d · 2025-10-17T10:08:57.000+01:00
diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs
@@ -302,10 +302,10 @@ public  bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkI
             return competencyAssessmentDataService.UpdatePrimaryFrameworkCompetencies(assessmentId, frameworkId);
         }
 
-       public int? GetSelfAssessmentStructure(int competencyAssessmentId)
+        public int? GetSelfAssessmentStructure(int competencyAssessmentId)
         {
             return competencyAssessmentDataService.GetSelfAssessmentStructure(competencyAssessmentId);
-
+        }
         public IEnumerable<CompetencyAssessmentCollaboratorDetail> GetCollaboratorsForCompetencyAssessmentId(int competencyAssessmentId)
         {
             return competencyAssessmentDataService.GetCollaboratorsForCompetencyAssessmentId(competencyAssessmentId);

Original file line number	Diff line number	Diff line change
`@@ -302,10 +302,10 @@ public bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkI`
`302`	`302`	`return competencyAssessmentDataService.UpdatePrimaryFrameworkCompetencies(assessmentId, frameworkId);`
`303`	`303`	`}`
`304`	`304`
`305`		`- public int? GetSelfAssessmentStructure(int competencyAssessmentId)`
	`305`	`+ public int? GetSelfAssessmentStructure(int competencyAssessmentId)`
`306`	`306`	`{`
`307`	`307`	`return competencyAssessmentDataService.GetSelfAssessmentStructure(competencyAssessmentId);`
`308`		`-`
	`308`	`+ }`
`309`	`309`	`public IEnumerable<CompetencyAssessmentCollaboratorDetail> GetCollaboratorsForCompetencyAssessmentId(int competencyAssessmentId)`
`310`	`310`	`{`
`311`	`311`	`return competencyAssessmentDataService.GetCollaboratorsForCompetencyAssessmentId(competencyAssessmentId);`