Resolve merge conflict.

dotnet · Feb 27, 2023 · d98dbd0 · d98dbd0
1 parent 2ece1fb
commit d98dbd0
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
@@ -130,7 +130,6 @@ stages:
 
  - template: run-nunit-tests.yaml
  parameters:
- useDotNet: true
  testRunTitle: WearOS On Device - macOS
  testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
  dotNetTestExtraArgs: --filter "TestCategory = WearOS"