Remove merge-conflict marker merged by accident

nicoddemus · nicoddemus · commit c5675d3efc38 · 2016-08-23T23:43:05.000-03:00
Unfortunately rst-lint didn't catch that
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -46,7 +46,6 @@
 .. _#1832: https://github.com/pytest-dev/pytest/issues/1832
 .. _#1849: https://github.com/pytest-dev/pytest/issues/1849
 
->>>>>>> master
 
 3.0.0
 =====
