From cdca9443cab19f992e76a205533be0d13c091d47 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@redhat.com>
Date: Tue, 8 Apr 2008 13:11:09 -0400
Subject: Merge.

---
 cobbler.spec | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'cobbler.spec')

diff --git a/cobbler.spec b/cobbler.spec
index b4e04bd..9e64040 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -191,15 +191,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-<<<<<<< HEAD:cobbler.spec
-* Wed Mar 26 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1
+* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1
 - Upstream changes (see CHANGELOG)
 - packaged /etc/cobbler/users.conf
 
-* Mon Mar 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1
-=======
 * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1
->>>>>>> master:cobbler.spec
 - Upstream changes (see CHANGELOG)
 
 * Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1
-- 
cgit