Remove merge turd

wsanchez · wsanchez · commit 304d382b1c44 · 2021-01-14T11:35:34.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,6 @@
 [i129]: https://github.com/python-hyper/hyperlink/issues/129
 [i134]: https://github.com/python-hyper/hyperlink/issues/134
 [i146]: https://github.com/python-hyper/hyperlink/issues/146
->>>>>>> master
 
 ## 20.0.1
 
