diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-12-19 11:42:38 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-12-19 11:42:38 -0500 |
| commit | 14baa6d004c9e1a63be31c8b61bc209c170c1ca4 (patch) | |
| tree | a695be0e2c3abb8deedbcab8fac8379a85839516 /cobbler.spec | |
| parent | 6f9db8046a9e2621855fce115ddf404bc0f9bb9f (diff) | |
| download | cobbler-14baa6d004c9e1a63be31c8b61bc209c170c1ca4.tar.gz cobbler-14baa6d004c9e1a63be31c8b61bc209c170c1ca4.tar.xz cobbler-14baa6d004c9e1a63be31c8b61bc209c170c1ca4.zip | |
Remove merge conflicts
Diffstat (limited to 'cobbler.spec')
| -rw-r--r-- | cobbler.spec | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cobbler.spec b/cobbler.spec index a1d634f6..1eb0313c 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,11 +2,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no -<<<<<<< HEAD:cobbler.spec -Version: 1.2.9 -======= Version: 1.4.0 ->>>>>>> devel:cobbler.spec Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ |