From 781c1ed0553c6ea34f499851d1bd9c185d85a6dd Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 4 Jan 2012 20:53:57 +0000
Subject: [PATCH] Redo xnba-undi.spec changes

Former-commit-id: c904040de202a5481942471ba8b4e50d32f8dac9
---
 xnba/xnba-undi.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/xnba/xnba-undi.spec b/xnba/xnba-undi.spec
index 2a93a9e..afde87c 100644
--- a/xnba/xnba-undi.spec
+++ b/xnba/xnba-undi.spec
@@ -15,12 +15,7 @@ BuildArch:	noarch
 %define os_release %(rpm -q --qf '%%{release}' %{Distribution}-release | cut -d"." -f 1)
 
 
-<<<<<<< HEAD
-#git from 2011/12/15
-Source0: xnba-%{version}-111215.tar.bz2 
-=======
 Source0: xnba-%{version}-111103.tar.bz2
->>>>>>> Update spec file
 
 %description
 The xCAT Network Boot Agent is a slightly modified version of gPXE.  It provides enhanced boot features for any UNDI compliant x86 host.  This includes iSCSI, http/ftp downloads, and gPXE script based booting.