fix merge

f14e8715 · Aaron Tidwell · a6fe910d · f14e8715
Commit f14e8715 authored Feb 18, 2019 by Aaron Tidwell
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

CHANGELOG.md CHANGELOG.md +0 -3

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
-<<<<<<< HEAD
-=======
 ### 2.2.0
 - Add timeout support (#39)

->>>>>>> master
 ### 2.1.2
 - Force escaping of all url params (#34)