Changelog for PR #98

524c2714 · Julien Muchembled · 589f327a · 524c2714
Commit 524c2714 authored Aug 20, 2016 by Julien Muchembled
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

src/CHANGES.txt src/CHANGES.txt +3 -0

No files found.
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -26,6 +26,9 @@ Bugs Fixed
  transaction.
  https://github.com/zopefoundation/ZODB/pull/52

+- Call _p_resolveConflict() even if a conflicting change doesn't change the
+  state. This reverts to the behaviour of 3.10.3 and older.
+
 3.10.5 (2011-11-19)
 ===================