Fix merge errors

alex-kulakov · alex-kulakov · commit 6e7aac65c798 · 2025-06-11T11:30:58.000+05:00
diff --git a/Orm/Xtensive.Orm.Tests/Upgrade/Models/Upgrader.cs b/Orm/Xtensive.Orm.Tests/Upgrade/Models/Upgrader.cs
@@ -68,7 +68,7 @@ public static IDisposable EnableForVersion(int version, ModelParts parts)
 
     public override bool CanUpgradeFrom(string oldVersion) => true;
 
-    protected override void AddUpgradeHints(Collections.ISet<UpgradeHint> hints)
+    protected override void AddUpgradeHints(ISet<UpgradeHint> hints)
     {
       if (runningVersion == 2)
         Version1To2Hints.ForEach(hint => hints.Add(hint));

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static IDisposable EnableForVersion(int version, ModelParts parts)`
`68`	`68`
`69`	`69`	`public override bool CanUpgradeFrom(string oldVersion) => true;`
`70`	`70`
`71`		`- protected override void AddUpgradeHints(Collections.ISet<UpgradeHint> hints)`
	`71`	`+ protected override void AddUpgradeHints(ISet<UpgradeHint> hints)`
`72`	`72`	`{`
`73`	`73`	`if (runningVersion == 2)`
`74`	`74`	`Version1To2Hints.ForEach(hint => hints.Add(hint));`