fixup! Merge remote-tracking branch 'origin/master' into zope4py2

stack/erp5/buildout.cfg

@@ -671,12 +671,7 @@ pysvn = 1.9.15+SlapOSPatched001
 python-ldap = 2.4.32+SlapOSPatched001
 python-magic = 0.4.12+SlapOSPatched001
 PyPDF2 = 1.26.0+SlapOSPatched001
-<<<<<<< HEAD
 Zope = 4.5.3+SlapOSPatched002
-||||||| 1bd453537
-Zope2 = 2.13.30+SlapOSPatched001
-=======
->>>>>>> origin/master
 ## https://lab.nexedi.com/nexedi/slapos/merge_requests/648
 pylint = 1.4.4+SlapOSPatched002
 # astroid 1.4.1 breaks testDynamicClassGeneration
@@ -706,19 +701,7 @@ zope.app.testing = 3.8.1
 APacheDEX = 1.8
 Pillow = 6.2.2
 Products.CMFActionIcons = 2.1.3
-<<<<<<< HEAD
-Products.DCWorkflowGraph = 0.4.1
-# Products.ExternalEditor 2.0.0's dtml is not based on Zope2 OFS's one.
-Products.ExternalEditor = 3.0.1
-#Products.GenericSetup = 1.8.6
-||||||| 1bd453537
-Products.DCWorkflowGraph = 0.4.1
-# Products.ExternalEditor 2.0.0's dtml is not based on Zope2 OFS's one.
-Products.ExternalEditor = 1.1.1
-Products.GenericSetup = 1.8.6
-=======
 Products.GenericSetup = 1.8.6
->>>>>>> origin/master
 Products.LongRequestLogger = 2.1.0
 Products.MimetypesRegistry = 2.1.8
 Products.PluggableAuthService = 2.3
@@ -837,7 +820,6 @@ zope.interface = 5.2.0
 ZConfig = 3.5.0
 Products.CMFCore = 2.5.4
 Products.StandardCacheManagers = 4.1.0
-Products.ZSQLMethods = 3.14
 Products.ExternalMethod = 4.5
 Products.GenericSetup = 2.1.5
 Products.PythonScripts = 4.13