Merge branch 'master' into jugmac00-update-object-publisher-documenta…

…tion-http-publishing
zopefoundation · Feb 5, 2019 · d3c27b0 · d3c27b0
2 parents 769f956 + b1c176b
commit d3c27b0
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/ZPublisher/WSGIPublisher.py b/src/ZPublisher/WSGIPublisher.py
@@ -28,7 +28,6 @@
     Unauthorized,
     upgradeException,
 )
-from ZODB.POSException import ConflictError
 from zope.component import queryMultiAdapter
 from zope.event import notify
 from zope.globalrequest import setRequest, clearRequest