Skip to content

slapos-caddy
slapos-caddy
Commit 4a48c6ca authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

finish to solve conflicts

parent 7d7cac92
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
software/erp5testnode/software.cfg
View file @ 4a48c6ca
...@@ -204,13 +204,9 @@ PyXML = 0.8.4 ...@@ -204,13 +204,9 @@ PyXML = 0.8.4
# Required by: # Required by:
# hexagonit.recipe.cmmi==1.5.0 # hexagonit.recipe.cmmi==1.5.0
<<<<<<< HEAD
# Use patched hexagonit.recipe.download from # Use patched hexagonit.recipe.download from
# https://github.com/SlapOS/hexagonit.recipe.download # https://github.com/SlapOS/hexagonit.recipe.download
hexagonit.recipe.download = 1.5.1-dev-slapos-001 hexagonit.recipe.download = 1.5.1-dev-slapos-001
=======
hexagonit.recipe.download = 1.5.1
>>>>>>> seleniumrunner
# Required by: # Required by:
# slapos.cookbook==0.38 # slapos.cookbook==0.38
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7