From 4906c2acceaa4030858c0db2a0f00d0519cea8eb Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 4 Jan 2012 20:53:51 +0000
Subject: [PATCH] No change

Former-commit-id: 48a92ef2fe644e9923185e6114778e028dc7ded3
---
 xnba/xnba-undi.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xnba/xnba-undi.spec b/xnba/xnba-undi.spec
index dde912b..2a93a9e 100644
--- a/xnba/xnba-undi.spec
+++ b/xnba/xnba-undi.spec
@@ -1,6 +1,6 @@
 Name:           xnba-undi
 Version:        1.0.3
-Release:        4
+Release:        5
 Summary:        xCAT Network Boot Agent for x86 PXE hosts
 Obsoletes:	gpxe-undi
 
@@ -15,8 +15,12 @@ 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.