ci: Adjust ios test run for 4.1

Author: jeromelaban

build/test-scripts/ios-uitest-run.sh

@@ -82,17 +82,12 @@ export UNO_TESTS_LOCAL_TESTS_FILE=$BUILD_SOURCESDIRECTORY/src/SamplesApp/Samples
 export UNO_UITEST_BENCHMARKS_PATH=$BUILD_ARTIFACTSTAGINGDIRECTORY/benchmarks/ios-automated
 export UNO_UITEST_RUNTIMETESTS_RESULTS_FILE_PATH=$BUILD_SOURCESDIRECTORY/build/RuntimeTestResults-ios-automated.xml
 
-<<<<<<< HEAD
-if [ $(wc -l < "$UNO_TESTS_FAILED_LIST") -eq 1 ];
-then
-=======
 export UNO_UITEST_SIMULATOR_VERSION="com.apple.CoreSimulator.SimRuntime.iOS-15-2"
 export UNO_UITEST_SIMULATOR_NAME="iPad Pro (12.9-inch) (4th generation)"
 
 UITEST_IGNORE_RERUN_FILE="${UITEST_IGNORE_RERUN_FILE:=false}"
 
 if [ $(wc -l < "$UNO_TESTS_FAILED_LIST") -eq 1 ] && [ "$UITEST_IGNORE_RERUN_FILE" != "true" ]; then
->>>>>>> 7907def7d (ci: Refactor pre-install selection)
 	# The test results file only contains the re-run marker and no
 	# other test to rerun. We can skip this run.
 	echo "The file $UNO_TESTS_FAILED_LIST does not contain tests to re-run, skipping."