[transifex-client/f19: 8/8] Use system-wide python-backports-ssl

[Eduardo Javier Echeverria Alvarado]

commit ffa95f406f94eeb9f4f42cd46b931e2f665c68fb
Author: Eduardo Echeverria <echevemaster at echevemaster.local>
Date:   Thu Oct 24 18:07:44 2013 -0430

    Use system-wide python-backports-ssl

 transifex-client.spec |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)
---
diff --git a/transifex-client.spec b/transifex-client.spec
index 50d84de..204b8e8 100644
--- a/transifex-client.spec
+++ b/transifex-client.spec
@@ -2,11 +2,7 @@
 
 Name:           transifex-client
 Version:        0.9
-<<<<<<< HEAD
-Release:        4%{?dist}
-=======
 Release:        6%{?dist}
->>>>>>> master
 Summary:        Command line tool for Transifex translation management
 
 Group:          Development/Languages
@@ -16,13 +12,9 @@ Source:         http://pypi.python.org/packages/source/t/transifex-client/%{name
 Patch0:         transifex-client-0.9-use-system-wide-backports-ssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-<<<<<<< HEAD
-Requires:       python-setuptools
-=======
 
 Requires:       python-setuptools
 Requires:       python-backports-ssl
->>>>>>> master
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 
@@ -52,19 +44,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 
 %changelog
-<<<<<<< HEAD
-* Thu Oct 10 2013 Luis Bazan <lbazan at fedoraproject.org> - 0.9-4
-- Fix BZ#1002546
-
-* Mon Aug 26 2013 Luis Bazan <lbazan at fedoraproject.org> - 0.9-3
-- remove dependency
-
-* Thu Aug 15 2013 Luis Bazan <lbazan at fedoraproject.org> - 0.9-2
-- add new dependency
-
-* Fri May 24 2013 Luis Bazan <lbazan at fedoraproject.org> - 0.9-1
-- New Upstream version
-=======
 * Thu Oct 24 2013 Eduardo Echeverria <echevemaster at gmail.com> - 0.9-6
 - Use system wide python-backports-ssl
 
@@ -82,7 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri May 24 2013 Luis Bazan <lbazan at fedoraproject.org> - 0.9-1
 - New Upstream Version
->>>>>>> master
 
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild