summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/system/system.test4
1 files changed, 0 insertions, 4 deletions
diff --git a/modules/system/system.test b/modules/system/system.test
index 17c76a65a..f2dba82ed 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -518,11 +518,7 @@ class AccessDeniedTestCase extends DrupalWebTestCase {
$edit = array(
'title' => $this->randomName(10),
-<<<<<<< system.test
- NODE_BODY_FIELD => array(array('value' => $this->randomName(100))),
-=======
'body' => array(array('value' => $this->randomName(100))),
->>>>>>> 1.47
);
$node = $this->drupalCreateNode($edit);