backend/spacewalk-backend.spec | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 213cbd620eb0e55df1dc17373016f7b5e284b6c5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Jul 8 10:24:38 2010 +0200
forgot to save file after resolving conflict during rebase of
7d48d4d7ab096551c7a53c7670c76ec83c441303
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 06d20a6..0850f46 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,13 +7,8 @@
Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
-<<<<<<< HEAD
-License: GPLv2
-Version: 1.1.27
-=======
License: GPLv2 and Python
-Version: 1.1.26
->>>>>>> add to license PYTHON since we use compile.py
+Version: 1.1.27
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz