[perl-pmtools/el6] Clean conflict lines

[Jose Pedro Oliveira]

commit d844cecb31fdd1c2d644374591b2215ac568c16a
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sat Feb 8 20:53:07 2014 +0000

    Clean conflict lines

 perl-pmtools.spec |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/perl-pmtools.spec b/perl-pmtools.spec
index b3cc5ab..7302bbb 100644
--- a/perl-pmtools.spec
+++ b/perl-pmtools.spec
@@ -1,11 +1,6 @@
 Name:           perl-pmtools
-<<<<<<< HEAD
-Version:        1.54
-Release:        2%{?dist}
-=======
 Version:        2.0.0
 Release:        1%{?dist}
->>>>>>> master
 Summary:        A suite of small programs to help manage Perl modules
 
 Group:          Development/Libraries
@@ -61,12 +56,9 @@ make test
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Sat Feb  8 2014 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.0-1
 - Update to 2.0.0.
 
->>>>>>> master
 * Wed Dec 11 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.54-2
 - The test suite also needs the less command in the build root (F20+).