add changelog note for fix #704

pytest-dev · Sep 28, 2015 · d29084e · d29084e
1 parent c5faa00
commit d29084e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -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.