From dc10dca02f06be4e1ee32e8b3e501b6330c20b0a Mon Sep 17 00:00:00 2001
From: Mayoro Diagne <mayoro@nexedi.com>
Date: Thu, 13 Sep 2012 12:24:49 +0000
Subject: [PATCH] clean software.cfg after solving merge conflicts
---
software/drupal/software.cfg | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/software/drupal/software.cfg b/software/drupal/software.cfg
index 44e87c42a..ec66694c0 100644
--- a/software/drupal/software.cfg
+++ b/software/drupal/software.cfg
@@ -5,7 +5,6 @@ extends =
[application]
recipe = slapos.recipe.build:download-unpacked
-
url = http://ftp.drupal.org/files/projects/drupal-7.15.tar.gz
md5sum = f42c9baccd74e1d035d61ff537ae21b4
@@ -15,22 +14,7 @@ url = ${:_profile_base_location_}/settings.php.in
md5sum = add9e4e96094a9d3fb7cf0f4d26ae544
download-only = True
filename = template.in
-
-
-
-
-[instance-recipe]
-egg = slapos.cookbook
-module = lamp.simple
-
-
-# Default template for the instance.
-
-
-#md5sum = Student shall put md5 of instance.cfg here
-
-
-
+mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[application-configuration]
--
2.30.9