From df6b3dbcd5aa170d0c41e3a23c1c8c3b8a95fa8b Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Tue, 17 Sep 2013 14:42:06 +0200
Subject: [PATCH] Merge branch 'master' of https://github.com/thelia/thelia

# By Etienne Roudeix (10) and franck (2)
# Via Etienne Roudeix (3) and franck (2)
* 'master' of https://github.com/thelia/thelia:
  Polished categories related content
  Finished category related content management
  delivery process
  delivery form
  order delivery form
  fix fixture dependant unit test
  delivery process
  delivery process
  cart integration
  cart integration
  cart page
  cart template

Conflicts:
	install/faker.php
---
 install/insert.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/insert.sql b/install/insert.sql
index e50c0bd81..c7287089f 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -34,7 +34,7 @@ INSERT INTO `module` (`id`, `code`, `type`, `activate`, `position`, `full_namesp
 (1, 'DebugBar', 1, 1, 1, 'DebugBar\\DebugBar', NOW(), NOW()),
 (2, 'Colissimo', 2, 1, 1, 'Colissimo\\Colissimo', NOW(), NOW());
 
-INSERT INTO  `thelia_2`.`module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
+INSERT INTO  `module_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES
 ('2',  'en_US',  '72h delivery', NULL,  NULL,  NULL),
 ('2',  'fr_FR',  'Livraison par colissimo en 72h', NULL,  NULL,  NULL);