[openscap: 3/3] fix garbage in spec file

[Peter Vrabec]

commit 46029d73c402d29e069527df2c45e91e78e7d6cf
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Fri Jun 24 13:14:40 2011 +0200

    fix garbage in spec file

 openscap.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/openscap.spec b/openscap.spec
index 9fe14b9..1e8d869 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -2,13 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-<<<<<<< HEAD
 Version:        0.7.3
 Release:        1%{?dist}
-=======
-Version:        0.7.2
-Release:        3%{?dist}
->>>>>>> 2c4d9c6cb96298d20573409541a252b7e5ea6a4d
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+