[python-w3lib/f20] changes to the spec

[Eduardo Javier Echeverria Alvarado]

commit 5595eac49d4009ee4cd72e1bb02c81ee5bbfc021
Author: Eduardo Echeverria <echevemaster at gmail.com>
Date:   Sun Feb 15 03:33:38 2015 -0430

    changes to the spec

 python-w3lib.spec |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/python-w3lib.spec b/python-w3lib.spec
index b6e5a13..0cb5688 100644
--- a/python-w3lib.spec
+++ b/python-w3lib.spec
@@ -1,24 +1,20 @@
 %global tarball_name w3lib 
 
 Name:           python-w3lib
-<<<<<<< HEAD
 Version:        1.3
 Release:        2%{?dist}
-=======
 Version:        1.11.0
 Release:        1%{?dist}
->>>>>>> master
 Summary:        Library of web-related functions
 
 Group:          Development/Languages
 License:        BSD
 URL:            https://github.com/scrapy/w3lib
 Source0:        https://pypi.python.org/packages/source/w/%{tarball_name}/%{tarball_name}-%{version}.tar.gz
-<<<<<<< HEAD
+
 
 BuildArch:      noarch
 BuildRequires:  python2-devel python-setuptools
-=======
 # Usually pypi packages does not include license boilerplate.
 # so, I've downloaded it from the project github repository
 # wget -N https://raw.githubusercontent.com/scrapy/w3lib/master/LICENSE -O LICENSE-w3lib
@@ -26,7 +22,7 @@ Source1:        LICENSE-w3lib
 BuildArch:      noarch
 BuildRequires:  python2-devel python-setuptools
 Requires:       python-six
->>>>>>> master
+
 
 %description
 This is a Python library of web-related functions, such as:
@@ -50,7 +46,6 @@ This is a Python library of web-related functions, such as:
 rm -rf w3lib.egg-info
 # copy LICENSE-w3lib file to sources as well.
 cp -a %{SOURCE1} .
->>>>>>> master
 
 %build
 %{__python2} setup.py build
@@ -62,12 +57,6 @@ rm -rf %{buildroot}
 
 
 %files
-<<<<<<< HEAD
-%{python2_sitelib}/*
-
-
-%changelog
-=======
 %doc README.rst LICENSE-w3lib
 %{python2_sitelib}/w3lib/
 %{python2_sitelib}/w3lib-*.egg-info
@@ -80,7 +69,6 @@ rm -rf %{buildroot}
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
->>>>>>> master
 * Mon Sep 09 2013 Daniel Bruno <dbruno at fedoraproject.org> - 1.3-2
 - Adjusting the spec for Fedora patterns