Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Fixed a merge problem.

merge-requests/26/head
Dries Buytaert 2009-06-13 21:07:53 +00:00
parent daedf71b7c
commit bc50341c5c
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/system/system.test
View File

@ -518,11 +518,7 @@ class AccessDeniedTestCase extends DrupalWebTestCase {
$edit = array( $edit = array(
'title' => $this->randomName(10), 'title' => $this->randomName(10),
<<<<<<< system.test
NODE_BODY_FIELD => array(array('value' => $this->randomName(100))),
=======
'body' => array(array('value' => $this->randomName(100))), 'body' => array(array('value' => $this->randomName(100))),
>>>>>>> 1.47
); );
$node = $this->drupalCreateNode($edit); $node = $this->drupalCreateNode($edit);