From 0101a47431b3664549eb66478de6616d63c429a9 Mon Sep 17 00:00:00 2001
From: Franck Allimant <franck@cqfdev.fr>
Date: Thu, 24 Apr 2014 16:29:56 +0200
Subject: [PATCH] Added Colissimo to the list of standard modules

---
 .gitignore | 87 +++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb3b4d299..3017e8d48 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,44 @@
-local/config/build.properties
-local/config/config_db.php
-local/config/build
-local/config/database.yml
-local/config/database.yml.sample.save
-core/vendor
-local/config/runtime-conf.xml
-cache/*
-log/*
-bin/*
-local/session/*
-coverage
-.idea
-.buildpath
-.project
-.settings/
-local/media/documents/*
-local/media/images/*
-web/assets/*
-web/cache/*
-web/tinymce
-web/media
-phpdoc*.log
-xhprof/
-phpunit.phar
-.DS_Store
-phpmyadmin
-composer.phar
-web/.htaccess
-
-# Ignore everything in the "modules" directory, except the "default modules"
-local/modules/*
-!local/modules/Cheque/
-!local/modules/Front/
-!local/modules/TheliaDebugBar/
-!local/modules/Tinymce/
-
-# Ignore everything in the "templates" directory, except the "default template"
-templates/*
-!templates/backOffice/
-!templates/email/
-!templates/frontOffice/
-!templates/pdf/
+local/config/build.properties
+local/config/config_db.php
+local/config/build
+local/config/database.yml
+local/config/database.yml.sample.save
+core/vendor
+local/config/runtime-conf.xml
+cache/*
+log/*
+bin/*
+local/session/*
+coverage
+.idea
+.buildpath
+.project
+.settings/
+local/media/documents/*
+local/media/images/*
+web/assets/*
+web/cache/*
+web/tinymce
+web/media
+phpdoc*.log
+xhprof/
+phpunit.phar
+.DS_Store
+phpmyadmin
+composer.phar
+web/.htaccess
+
+# Ignore everything in the "modules" directory, except the "default modules"
+local/modules/*
+!local/modules/Cheque/
+!local/modules/Front/
+!local/modules/TheliaDebugBar/
+!local/modules/Tinymce/
+!local/modules/Colissimo/
+
+# Ignore everything in the "templates" directory, except the "default template"
+templates/*
+!templates/backOffice/
+!templates/email/
+!templates/frontOffice/
+!templates/pdf/