oops, missed one

grendello · grendello · commit f802ad8b7814 · 2026-01-14T10:53:56.000+01:00
diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
@@ -1573,14 +1573,10 @@ public void FastDeployEnvironmentFiles ([Values] bool isRelease, [Values] bool e
 		[Test]
 		public void FixLegacyResourceDesignerStep ([Values] bool isRelease, [Values] AndroidRuntime runtime)
 		{
-<<<<<<< HEAD
 			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
 				return;
 			}
-			string previousTargetFramework = "net9.0-android";
-=======
 			string previousTargetFramework = $"{XABuildConfig.PreviousDotNetTargetFramework}-android";
->>>>>>> main
 
 			// Don't call SetRuntime on library projects (at least until "previous" framework bumps to at least 10.0)
 			var library1 = new XamarinAndroidLibraryProject {

Original file line number	Diff line number	Diff line change
`@@ -1573,14 +1573,10 @@ public void FastDeployEnvironmentFiles ([Values] bool isRelease, [Values] bool e`
`1573`	`1573`	`[Test]`
`1574`	`1574`	`public void FixLegacyResourceDesignerStep ([Values] bool isRelease, [Values] AndroidRuntime runtime)`
`1575`	`1575`	`{`
`1576`		`-<<<<<<< HEAD`
`1577`	`1576`	`if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {`
`1578`	`1577`	`return;`
`1579`	`1578`	`}`
`1580`		`- string previousTargetFramework = "net9.0-android";`
`1581`		`-=======`
`1582`	`1579`	`string previousTargetFramework = $"{XABuildConfig.PreviousDotNetTargetFramework}-android";`
`1583`		`->>>>>>> main`
`1584`	`1580`
`1585`	`1581`	`// Don't call SetRuntime on library projects (at least until "previous" framework bumps to at least 10.0)`
`1586`	`1582`	`var library1 = new XamarinAndroidLibraryProject {`