diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-06-13 21:07:53 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-06-13 21:07:53 +0000 |
commit | bc50341c5c4093abdc5077fc3d8a9dabe1885304 (patch) | |
tree | c5a589725bc7c04e9651aeb0d1f8fc6e676e5032 /modules/system/system.test | |
parent | daedf71b7c1683a21df35e2f9d8660e89deeea62 (diff) | |
download | brdo-bc50341c5c4093abdc5077fc3d8a9dabe1885304.tar.gz brdo-bc50341c5c4093abdc5077fc3d8a9dabe1885304.tar.bz2 |
- Fixed a merge problem.
Diffstat (limited to 'modules/system/system.test')
-rw-r--r-- | modules/system/system.test | 4 |
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); |