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

98cea865 · Jérome Perrin · ba82b9d0 · 98cea865
Commit 98cea865 authored Jun 27, 2022 by Jérome Perrin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 12 deletions

stack/erp5/buildout.cfg stack/erp5/buildout.cfg +0 -12

No files found.
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -759,18 +759,6 @@ toolz = 0.9.0
 zope.globalrequest = 1.5
 waitress = 1.4.4
 xlrd = 1.1.0
-
-<<<<<<< HEAD
-# Re-add for as it is required to be there for uninstallation
-erp5.recipe.w3validator = 1.0.2
-
-||||||| 1bd453537
-# Re-add for as it is required to be there for uninstallation
-erp5.recipe.w3validator = 1.0.2
-Products.ZSQLMethods = 2.13.5
-=======
-Products.ZSQLMethods = 2.13.5
->>>>>>> origin/master
 fpconst = 0.7.2
 graphviz = 0.5.2
 olefile = 0.44