[drupal7-webform/el6] Fix el6 spec file

[Peter Borsa]

commit 1b49000965df6b52e534f47e2667082bc6a6317d
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Tue Nov 25 12:44:39 2014 +0100

    Fix el6 spec file

 drupal7-webform.spec |   19 ++++---------------
 1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/drupal7-webform.spec b/drupal7-webform.spec
index c059702..3292e63 100644
--- a/drupal7-webform.spec
+++ b/drupal7-webform.spec
@@ -1,18 +1,10 @@
 %{?drupal7_find_provides_and_requires}
 
 %global module_name webform
-<<<<<<< HEAD
-%global prerelease beta3
-
-Name:          drupal7-%{module_name}
-Version:       4.0
-Release:       0.3.%{prerelease}%{?dist}
-=======
 
 Name:          drupal7-%{module_name}
 Version:       4.1
-Release:       1%{?dist}
->>>>>>> master
+Release:       2%{?dist}
 Summary:       Webform is the module for making surveys in Drupal
 
 Group:         Applications/Publishing
@@ -72,8 +64,9 @@ cp -pr * %{buildroot}%{drupal7_modules}/%{module_name}/
 
 
 %changelog
-<<<<<<< HEAD
-=======
+* Tue Nov 25 2014 Peter Borsa <peter.borsa at gmail.com> 4.1-2
+- Fix el6 spec file
+
 * Tue Nov 25 2014 Peter Borsa <peter.borsa at gmail.com> 4.1-1
 - Update to 4.1
 - Release notes can be found at https://www.drupal.org/node/2351973
@@ -81,16 +74,12 @@ cp -pr * %{buildroot}%{drupal7_modules}/%{module_name}/
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-0.3.beta3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
->>>>>>> master
 * Fri Mar 14 2014 Peter Borsa <peter.borsa at gmail.com> 4.0-0.2.beta3
 - Update to 4.0-beta3
 - Release notes can be found at https://drupal.org/node/2196069
 
-<<<<<<< HEAD
 * Fri Feb 28 2014 Peter Borsa <peter.borsa at gmail.com> 4.0-0.2.beta1
 - Remove php-pecl(zip) dependency
 
-=======
->>>>>>> master
 * Sat Jan 11 2014 Peter Borsa <peter.borsa at gmail.com> 4.0-0.1.beta1
 - Initial package