diff --git a/core/modules/language/src/Tests/LanguageListTest.php b/core/modules/language/src/Tests/LanguageListTest.php index 4b64bce..88e227f 100644 --- a/core/modules/language/src/Tests/LanguageListTest.php +++ b/core/modules/language/src/Tests/LanguageListTest.php @@ -75,12 +75,7 @@ function testLanguageList() { // Ensure we can't delete the default language. $this->drupalGet('admin/config/regional/language/delete/' . $langcode); -<<<<<<< HEAD - $this->assertUrl(\Drupal::url('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language])); - $this->assertText(t('The default language cannot be deleted.'), 'Failed to delete the default language.'); -======= $this->assertResponse(403, 'Failed to delete the default language.'); ->>>>>>> applied patch // Ensure 'Edit' link works. $this->drupalGet('admin/config/regional/language');