@@ -597,7+597,7 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {
// Check confirmation alert.
$this->assertTrue(
// Check confirmation alert.
$this->assertTrue(
- (bool)preg_match("/^This will run the batch merge process on the listed duplicates. The operation will run in safe mode - only records with no direct data conflicts will be merged. Click OK to proceed if you are sure you wish to run this operation./",
+ (bool)preg_match("/^This will run the batch merge process on the listed duplicates. The operation will run in safe mode - only records with no direct data conflicts will be merged. Click OK to proceed if you are sure you wish to run this operation./",
$this->getConfirmation()
));
$this->chooseOkOnNextConfirmation();
$this->getConfirmation()
));
$this->chooseOkOnNextConfirmation();
@@ -624,7+624,7 @@ class WebTest_Contact_MergeContactsTest extends CiviSeleniumTestCase {