From bc50341c5c4093abdc5077fc3d8a9dabe1885304 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 13 Jun 2009 21:07:53 +0000
Subject: [PATCH] - Fixed a merge problem.

---
 modules/system/system.test | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/system/system.test b/modules/system/system.test
index 17c76a65a7f..f2dba82ed82 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);