From c5675d3efc38ff20eed41a13ee2f27691a6144eb Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Tue, 23 Aug 2016 23:42:16 -0300
Subject: [PATCH] Remove merge-conflict marker merged by accident

Unfortunately rst-lint didn't catch that
---
 CHANGELOG.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bcf1984c9..0d244e020 100644
--- 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
 =====