[perl-Config-Generator] Problem with the git merge, now fixed

[Alexandre Beche]

commit c309c07ee6b9a3b2c66a62bb4739aa5af46b08b1
Author: Alexandre Beche <alexandre.beche at gmail.com>
Date:   Tue Apr 29 13:48:46 2014 +0200

    Problem with the git merge, now fixed

 perl-Config-Generator.spec |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/perl-Config-Generator.spec b/perl-Config-Generator.spec
index 3c31689..4ddd057 100644
--- a/perl-Config-Generator.spec
+++ b/perl-Config-Generator.spec
@@ -1,13 +1,7 @@
 Name:           perl-Config-Generator
-<<<<<<< HEAD
-Version:        0.5
-Release:        2%{?dist}
-Summary:        General purpose configuration generator
-=======
 Version:        0.7
 Release:        1%{?dist}
 Summary:        Shared variables for the Config::Generator modules
->>>>>>> el6
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Config-Generator/
@@ -60,14 +54,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
-<<<<<<< HEAD
-* Thu Mar 27 2014 Alexandre Beche <alexandre.beche at gmail.com> 0.5-2
-- minor change to specfile: Summary and description changed.
-=======
 * Tue Apr 29 2014 Alexandre Beche <alexandre.beche at gmail.com> 0.7-1
 - Added an example of a wrapper script in the "eg" directory.
 - Config::Generator::Template: added ifdef() and ifndef() macros.
->>>>>>> el6
+
+* Thu Mar 27 2014 Alexandre Beche <alexandre.beche at gmail.com> 0.5-2
+- minor change to specfile: Summary and description changed.
 
 * Thu Feb 20 2014 Alexandre Beche <alexandre.beche at gmail.com> 0.5-1
 - Specfile autogenerated by cpanspec 1.78.