Code was merged with erp5 master

7845f117 · Rafael Monnerat · 2d61ae08 · 7845f117
Commit 7845f117 authored Aug 27, 2012 by Rafael Monnerat
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

software/slapos-testing/software.cfg software/slapos-testing/software.cfg +1 -1

No files found.
--- a/software/slapos-testing/software.cfg
+++ b/software/slapos-testing/software.cfg
@@ -18,7 +18,7 @@ develop = ${buildout:parts-directory}/erp5.util-repository
 [erp5.util-repository]
 <= download-source
 repository = http://git.erp5.org/repos/erp5.git
-branch = for_testrunner_1
+branch = master

 [slapos.cookbook-repository]
 <= download-source