- Fixed a merge problem.

2009-06-13 21:07:53 +00:00 · 2009-06-13 21:07:53 +00:00 · bc50341c5c
parent daedf71b7c
commit bc50341c5c
1 changed files with 0 additions and 4 deletions
--- 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);