summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-04-08 13:09:36 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-04-08 13:09:36 -0400
commit9e0727785a0851ccdff880aa19bb8f21c4aa2840 (patch)
treea58c0f76e18b5c87734173fd59bf8b6ca625daa6 /cobbler.spec
parentf3a7e9f8a2b85fb936d98aa118bec5189b26140f (diff)
parenta124e7449fbc724637e45457905737883175d15f (diff)
downloadthird_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.zip
third_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.tar.gz
third_party-cobbler-9e0727785a0851ccdff880aa19bb8f21c4aa2840.tar.xz
Merge branch 'master' into devel
Conflicts: CHANGELOG cobbler.spec cobbler/webui/master.py
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec4
1 files changed, 4 insertions, 0 deletions
diff --git a/cobbler.spec b/cobbler.spec
index c4cc5a0..b4e04bd 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -191,11 +191,15 @@ 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
- 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