From 22c2d876330661707a45942551a70c1539944a82 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sun, 26 Jun 2016 21:18:01 +0200 Subject: [PATCH] Fix bad merge in CHANGELOG --- CHANGELOG.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 075df922f..2a18d2b86 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -54,11 +54,8 @@ .. _#1553: https://github.com/pytest-dev/pytest/issues/1553 .. _#1626: https://github.com/pytest-dev/pytest/pull/1626 .. _#1503: https://github.com/pytest-dev/pytest/issues/1503 -<<<<<<< HEAD .. _#1479: https://github.com/pytest-dev/pytest/issues/1479 -======= .. _#925: https://github.com/pytest-dev/pytest/issues/925 ->>>>>>> Improve of the test output for logical expression with brackets. .. _@graingert: https://github.com/graingert .. _@taschini: https://github.com/taschini