[Checkins] [zopefoundation/Zope] b1c176: remove import of ConflictError (#472)

[Jürgen Gmach]

  Branch: refs/heads/jugmac00-update-object-publisher-documentation-http-publishing
  Home:   https://github.com/zopefoundation/Zope
  Commit: b1c176bd86824904263a47b734c210462f05732d
      https://github.com/zopefoundation/Zope/commit/b1c176bd86824904263a47b734c210462f05732d
  Author: Thomas Schorr <t_schorr at gmx.de>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M src/ZPublisher/WSGIPublisher.py

  Log Message:
  -----------
  remove import of ConflictError (#472)


  Commit: d3c27b04e6dceaf4a6a20a8e36e4e6200d03f8d3
      https://github.com/zopefoundation/Zope/commit/d3c27b04e6dceaf4a6a20a8e36e4e6200d03f8d3
  Author: Jürgen Gmach <jugmac00 at users.noreply.github.com>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M src/ZPublisher/WSGIPublisher.py

  Log Message:
  -----------
  Merge branch 'master' into jugmac00-update-object-publisher-documentation-http-publishing


Compare: https://github.com/zopefoundation/Zope/compare/769f956267ac...d3c27b04e6dc