summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-04-08 13:11:09 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-04-08 13:11:09 -0400
commitcdca9443cab19f992e76a205533be0d13c091d47 (patch)
tree4a28b402b1d183f92eeaf2575700d03766e79909 /cobbler.spec
parent9e0727785a0851ccdff880aa19bb8f21c4aa2840 (diff)
downloadthird_party-cobbler-cdca9443cab19f992e76a205533be0d13c091d47.zip
third_party-cobbler-cdca9443cab19f992e76a205533be0d13c091d47.tar.gz
third_party-cobbler-cdca9443cab19f992e76a205533be0d13c091d47.tar.xz
Merge.
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec6
1 files changed, 1 insertions, 5 deletions
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