[Checkins] [zopefoundation/ZEO] e605c9: add client-conflict-resolution to doc

[GitHub]

  Branch: refs/heads/asyncio
  Home:   https://github.com/zopefoundation/ZEO
  Commit: e605c9758ca621ab70bd672bbd93c0052efebc48
      https://github.com/zopefoundation/ZEO/commit/e605c9758ca621ab70bd672bbd93c0052efebc48
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-08 (Fri, 08 Jul 2016)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  add client-conflict-resolution to doc

And move this file to the top of the project, as there was a similar
version ther.


  Commit: ee04b9918b8f4dd6edad3bc6d4060510a469920b
      https://github.com/zopefoundation/ZEO/commit/ee04b9918b8f4dd6edad3bc6d4060510a469920b
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-08 (Fri, 08 Jul 2016)

  Changed paths:
    R doc/README.rst

  Log Message:
  -----------
  Moved to top to replace an almost identical version


  Commit: 90ed6ec959a22c3a1b492b79140f03889b0b7e81
      https://github.com/zopefoundation/ZEO/commit/90ed6ec959a22c3a1b492b79140f03889b0b7e81
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-08 (Fri, 08 Jul 2016)

  Changed paths:
    M CHANGES.rst

  Log Message:
  -----------
  5.0.0a0


  Commit: d2095794acbfa2bc767052da833a5db7c4c5bb2c
      https://github.com/zopefoundation/ZEO/commit/d2095794acbfa2bc767052da833a5db7c4c5bb2c
  Author: Jim Fulton <jim at zope.com>
  Date:   2016-07-08 (Fri, 08 Jul 2016)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  fixed and simplified classifier handling


Compare: https://github.com/zopefoundation/ZEO/compare/1ce6fd78c8ef...d2095794acbf