finish to solve conflicts

4a48c6ca · Sebastien Robin · 7d7cac92 · 4a48c6ca
Commit 4a48c6ca authored Jan 24, 2013 by Sebastien Robin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

software/erp5testnode/software.cfg software/erp5testnode/software.cfg +0 -4

No files found.
--- a/software/erp5testnode/software.cfg
+++ b/software/erp5testnode/software.cfg
@@ -204,13 +204,9 @@ PyXML = 0.8.4

 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-<<<<<<< HEAD
 # Use patched hexagonit.recipe.download from
 # https://github.com/SlapOS/hexagonit.recipe.download
 hexagonit.recipe.download = 1.5.1-dev-slapos-001
-=======
-hexagonit.recipe.download = 1.5.1
->>>>>>> seleniumrunner

 # Required by:
 # slapos.cookbook==0.38