diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-03-12 13:07:54 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-03-12 13:07:54 -0400 |
| commit | cb518895c64bfb690a1f3df0aaeeb147209493c3 (patch) | |
| tree | 91894e2a03bf7cd73360612ce6b936ebaea02999 /cobbler.spec | |
| parent | 134f6113711e8ced404ac24f66b5e4e6aa6c56d4 (diff) | |
| parent | 4538680d3bd8cb1803349a9281cfdfcc722e0449 (diff) | |
| download | third_party-cobbler-cb518895c64bfb690a1f3df0aaeeb147209493c3.tar.gz third_party-cobbler-cb518895c64bfb690a1f3df0aaeeb147209493c3.tar.xz third_party-cobbler-cb518895c64bfb690a1f3df0aaeeb147209493c3.zip | |
Merge branch 'master' into devel
Conflicts:
CHANGELOG
cobbler.spec
setup.py
Diffstat (limited to 'cobbler.spec')
| -rw-r--r-- | cobbler.spec | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cobbler.spec b/cobbler.spec index 4b90755..aa61bd9 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -190,7 +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 |