summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-05-28 11:23:52 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-05-28 11:23:52 -0400
commit6ee9060231d870a0caff22ec4d5312495a0c2e6b (patch)
tree60bd99338773fb4c6c7cb28dca725fe4fb9afed9 /cobbler.spec
parentc4bec92826234f68eab64878e88046dbb78b0d57 (diff)
downloadthird_party-cobbler-6ee9060231d870a0caff22ec4d5312495a0c2e6b.zip
third_party-cobbler-6ee9060231d870a0caff22ec4d5312495a0c2e6b.tar.gz
third_party-cobbler-6ee9060231d870a0caff22ec4d5312495a0c2e6b.tar.xz
Remove noise from previous merge
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec1
1 files changed, 0 insertions, 1 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 37dce30..8641f91 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -4,7 +4,6 @@ Name: cobbler
AutoReq: no
Version: 1.0.0
Release: 1%{?dist}
->>>>>>> devel:cobbler.spec
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System