post rebase merge conflict fix

kevwhitt-hee · kevwhitt-hee · commit d79749e0546e · 2025-02-13T14:46:57.000Z
diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs
@@ -175,7 +175,7 @@ CompetencyTableRow competencyRow
             int? frameworkCompetencyGroupId = null;
             if (competencyRow.CompetencyGroup != null)
             {
-                newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId);
+                var newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId);
                 if (newCompetencyGroupId > 0)
                 {
                     frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminUserId);

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ CompetencyTableRow competencyRow`
`175`	`175`	`int? frameworkCompetencyGroupId = null;`
`176`	`176`	`if (competencyRow.CompetencyGroup != null)`
`177`	`177`	`{`
`178`		`- newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId);`
	`178`	`+ var newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId);`
`179`	`179`	`if (newCompetencyGroupId > 0)`
`180`	`180`	`{`
`181`	`181`	`frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminUserId);`