From 711f1549db08e318df02abf8885e9e7c155ab328 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 27 Jul 2017 15:27:36 -0400
Subject: [PATCH] OpenBMC host firmware activation 2

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ab171aac2..153792d88 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -808,7 +808,6 @@ sub parse_command_status {
 
     if ($command eq "rflash") {
         my $check_version = 0;
-<<<<<<< HEAD
         my $list = 0;
         my $delete = 0;
         my $upload = 0;