[packagedb-cli/el6] Little spec cleaning

[Pierre-YvesChibon]

commit a3ec847d28de1ebcefd13c2f59236205270d0e7e
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Sep 5 11:25:21 2013 +0200

    Little spec cleaning

 packagedb-cli.spec |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/packagedb-cli.spec b/packagedb-cli.spec
index 1f4488c..76958cf 100644
--- a/packagedb-cli.spec
+++ b/packagedb-cli.spec
@@ -1,9 +1,5 @@
 Name:           packagedb-cli
-<<<<<<< HEAD
-Version:        1.5.0
-=======
 Version:        1.5.1
->>>>>>> master
 Release:        1%{?dist}
 Summary:        A CLI for pkgdb
 
@@ -65,9 +61,6 @@ install pkgdb-cli $RPM_BUILD_ROOT/%{_bindir}/
 - Update to 1.5.1
 - Fixes RHBZ#995430 and RHBZ#970120
 
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
 * Thu May 23 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 1.5.0-1
 - Update to 1.5.0
 - Fixes RHBZ#966196