Commit bc50341c authored by Dries's avatar Dries
Browse files

- Fixed a merge problem.

parent daedf71b
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment