Merge branch 'slaprunner_newcloud9' into slaprunner

Conflicts: software/slaprunner/software.cfg

Merge branch 'slaprunner_newcloud9' into slaprunner
Conflicts: software/slaprunner/software.cfg
6f92c092 · Cédric de Saint Martin · 5a6a7df4 · fe0941da · 6f92c092
Commit 6f92c092 authored Sep 19, 2012 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -155,7 +155,3 @@ zc.recipe.egg = 1.3.2
 # slapos.core==0.30
 zope.interface = 4.0.1
 pe.egg = 1.3.2
-
-# Required by:
-# slapos.core==0.28.2
-zope.interface = 4.0.1