rpms/python-urllib3
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Actually factually resolve the conflict

Browse source
This commit is contained in:
Jeremy Cline 2019-10-15 15:23:48 +00:00
commit 74bf066354
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python-urllib3.spec
View file

@ -4,13 +4,8 @@
%bcond_without tests
Name: python-%{srcname}
<<<<<<< HEAD
Version: 1.25.3
Release: 4%{?dist}
=======
Version: 1.25.6
Release: 1%{?dist}
>>>>>>> 5787270... Update to v1.25.6
Summary: Python HTTP library with thread-safe connection pooling and file post
License: MIT