kennethreitz/requests3
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests3.git synced 2026-06-05 23:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from dlstadther/fix-merge-confict

Browse Source 
Remove merge conflict collateral from AUTHORS.rst
This commit is contained in:
Kenneth Reitz
2019-04-19 10:57:04 -04:00
committed by GitHub
parent 351b6b129f 0401887b24
commit 14dbf76e8b
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AUTHORS.rst
-2
View File
@@ -183,11 +183,9 @@ Patches and Suggestions
- Shmuel Amar (`@shmuelamar <https://github.com/shmuelamar>`_)
- Gary Wu (`@garywu <https://github.com/garywu>`_)
- Ryan Pineo (`@ryanpineo <https://github.com/ryanpineo>`_)
<<<<<<< HEAD
- Ed Morley (`@edmorley <https://github.com/edmorley>`_)
- Matt Liu <liumatt@gmail.com> (`@mlcrazy <https://github.com/mlcrazy>`_)
- Taylor Hoff <primdevs@protonmail.com> (`@PrimordialHelios <https://github.com/PrimordialHelios>`_)
<<<<<<< HEAD
- Arthur Vigil (`@ahvigil <https://github.com/ahvigil>`_)
- Nehal J Wani (`@nehaljwani <https://github.com/nehaljwani>`_)
- Demetrios Bairaktaris (`@DemetriosBairaktaris <https://github.com/demetriosbairaktaris>`_)