From 4a48c6cadd7926e28b446fa2cba88d06a64aaf0f Mon Sep 17 00:00:00 2001 From: Sebastien Robin <seb@nexedi.com> Date: Thu, 24 Jan 2013 14:30:45 +0100 Subject: [PATCH] finish to solve conflicts --- software/erp5testnode/software.cfg | 4 ---- 1 file changed, 4 deletions(-) diff --git a/software/erp5testnode/software.cfg b/software/erp5testnode/software.cfg index 937c626f3..28e97c6ae 100644 --- 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 -- 2.30.9