From 1b9e2b16cfd0f8df7fa10d86d415d90fa02e21e7 Mon Sep 17 00:00:00 2001
From: daniceexi <wxp@cn.ibm.com>
Date: Wed, 4 Jun 2014 08:44:40 -0400
Subject: [PATCH] defect 4153: resolve the merge conflict which introduced by
 commit 899cb5028ddfa672e9af9ba884316072ef529048

---
 xCAT-server/lib/xcat/plugins/yaboot.pm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index f77b86416..3ce67366f 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -725,14 +725,8 @@ sub process_request {
       if ($errored) { 
 	  my $rsp;
 	  $rsp->{errorcode}->[0]=1;
-<<<<<<< HEAD
-	  $rsp->{error}->[0]="Failed in running end prescripts\n";
-	  $::YABOOT_callback->($rsp);
-	  return; 
-=======
 	  $rsp->{error}->[0]="Failed in running end prescripts.  Processing will still continue.\n";
-	  $callback->($rsp);
->>>>>>> 78b8d21... defect 4147 - allow nodeset to continue if prescript errors
+	  $::YABOOT_callback->($rsp);
       }
   }
 }