summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
authorroot <root@mdehaan.rdu.redhat.com>2008-04-08 16:24:06 -0400
committerroot <root@mdehaan.rdu.redhat.com>2008-04-08 16:24:06 -0400
commitc4a6d241faa677b9dbe9572addcd1148a72ffaba (patch)
treea386188021c04ac04c3ac1a669c02784d0a4f316 /cobbler.spec
parent68469d9c744b17d4bd291718dd4d03ff02b64db7 (diff)
downloadthird_party-cobbler-c4a6d241faa677b9dbe9572addcd1148a72ffaba.zip
third_party-cobbler-c4a6d241faa677b9dbe9572addcd1148a72ffaba.tar.gz
third_party-cobbler-c4a6d241faa677b9dbe9572addcd1148a72ffaba.tar.xz
merge
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec4
1 files changed, 0 insertions, 4 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 070bff3..ca6640f 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
* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1
- Upstream changes (see CHANGELOG)
- packaged /etc/cobbler/users.conf
-* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1
-=======
* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-2
->>>>>>> master:cobbler.spec
- Upstream changes (see CHANGELOG)
* Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1