ff

dellis1972 · dellis1972 · commit 756b59cffa76 · 2024-09-05T15:18:47.000+01:00
diff --git a/tests/msbuild-times-reference/MSBuildDeviceIntegration.csv b/tests/msbuild-times-reference/MSBuildDeviceIntegration.csv
@@ -8,19 +8,9 @@ Build_CSharp_Change,3500
 Build_AndroidResource_Change,2250
 Build_AndroidAsset_Change,6500
 Build_AndroidManifest_Change,4500
-<<<<<<< HEAD
 Build_JLO_Change,4500
 Build_XAML_Change,3000
 Install_CSharp_Change,4000
 Install_XAML_Change,3750
 Install_CSharp_FromClean,3000
-=======
-Build_Designer_Change,3000
-Build_JLO_Change,10000
-Build_CSProj_Change,12500
-Build_XAML_Change,7400
-Build_XAML_Change_RefAssembly,4000
-Install_CSharp_Change,4500
-Install_XAML_Change,5000
-Install_CSharp_FromClean,20000
->>>>>>> ff9341635 (Bump the timeout)
+Install_CSharp_FromClean,20000
