add changelog note for fix #704

2015-09-28 11:45:51 +02:00
parent c5faa00ace
commit d29084ec2c
1 changed files with 3 additions and 0 deletions
--- a/3
+++ b/3
@@ -1,6 +1,9 @@
 2.8.1.dev
 ---------

+- Fix issue #704: handle versionconflict during plugin loading more
+  gracefully.  Thanks Bruno Oliveira for the PR.
+
 - Fix issue #1064: ""--junitxml" regression when used with the
  "pytest-xdist" plugin, with test reports being assigned to the wrong tests.
  Thanks Daniel Grunwald for the report and Bruno Oliveira for the PR.