diff options
Diffstat (limited to 'cobbler.spec')
-rw-r--r-- | cobbler.spec | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cobbler.spec b/cobbler.spec index e34e0da..aa61bd9 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -Version: 0.8.3 +Version: 0.9.0 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ @@ -190,10 +190,14 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +<<<<<<< HEAD:cobbler.spec +* Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 +======= * Mon Mar 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1 +>>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Wed Feb 20 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.1-1 |