[Checkins] [zopefoundation/ZEO] 6b7f42: remove merge artifact

[GitHub]

  Branch: refs/heads/msgpack
  Home:   https://github.com/zopefoundation/ZEO
  Commit: 6b7f42abb0e7989369ed4eee85f5c356af0ad6ed
      https://github.com/zopefoundation/ZEO/commit/6b7f42abb0e7989369ed4eee85f5c356af0ad6ed
  Author: Jim Fulton <jim at zope.com>
  Date:   2017-01-08 (Sun, 08 Jan 2017)

  Changed paths:
    M CHANGES.rst

  Log Message:
  -----------
  remove merge artifact