Changelog for PR #98

7d436f39 · Julien Muchembled · b74eef76 · 7d436f39
Commit 7d436f39 authored Aug 20, 2016 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

CHANGES.rst CHANGES.rst +6 -0

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 Change History
 ================
+4.4.4 (unreleased)
+==================
+- Call _p_resolveConflict() even if a conflicting change doesn't change the
+  state. This reverts to the behaviour of 3.10.3 and older.
 4.4.3 (2016-08-04)
 ==================