[sparse/f19] Fix merge conflict in sparse.spec

[Jeff Layton]

commit 76de7438f8c201094204685787db7328ce321a09
Author: Jeff Layton <jlayton at redhat.com>
Date:   Wed Feb 26 18:23:07 2014 -0800

    Fix merge conflict in sparse.spec
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>

 sparse.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/sparse.spec b/sparse.spec
index 6b15156..8d4781c 100644
--- a/sparse.spec
+++ b/sparse.spec
@@ -1,11 +1,6 @@
 Name: sparse
-<<<<<<< current
-Version: 0.4.5.rc1
-Release: 2%{?dist}
-=======
 Version: 0.5.0
 Release: 1%{?dist}
->>>>>>> patched
 Summary:    A semantic parser of source files
 Group:      Development/Tools
 License:    MIT