[Checkins] [zopefoundation/ZODB] 097e74: Check invalidation in case of conflict resolution

[GitHub]

  Branch: refs/heads/jm-checkResolve
  Home:   https://github.com/zopefoundation/ZODB
  Commit: 097e74a2e6b8fa920b04318a83216bd7542ad4ad
      https://github.com/zopefoundation/ZODB/commit/097e74a2e6b8fa920b04318a83216bd7542ad4ad
  Author: Julien Muchembled <jm at jmuchemb.eu>
  Date:   2016-06-19 (Sun, 19 Jun 2016)

  Changed paths:
    M src/ZODB/tests/ConflictResolution.py
    M src/ZODB/tests/testDemoStorage.py

  Log Message:
  -----------
  Check invalidation in case of conflict resolution