diff options
Diffstat (limited to 'cobbler.spec')
| -rw-r--r-- | cobbler.spec | 6 |
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 |