core/modules/node/tests/src/Functional/NodeCreationTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/modules/node/tests/src/Functional/NodeCreationTest.php b/core/modules/node/tests/src/Functional/NodeCreationTest.php
index 29dc11f..20ba8d9 100644
--- a/core/modules/node/tests/src/Functional/NodeCreationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeCreationTest.php
@@ -77,10 +77,7 @@ public function testNodeCreation() {
     $admin_user = $this->drupalCreateUser(['administer nodes', 'create page content']);
     $this->drupalLogin($admin_user);
     $this->drupalGet('node/add/page');
-<<<<<<< ours
     $this->assertNoFieldById('edit-revision', NULL, 'The revision checkbox is not present.');
-=======
-    $this->assertNoFieldById('edit-revision', NULL , 'The revision checkbox is not present.');
 
     // Check that a user with user administer content types permission is not
     // allowed to create content.
@@ -88,7 +85,6 @@ public function testNodeCreation() {
     $this->drupalLogin($content_types_admin);
     $this->drupalGet('node/add/page');
     $this->assertResponse(403);
->>>>>>> theirs
   }
 
   /**