From 0fdb35da2baad18a0ab349464ef33000dea890a7 Mon Sep 17 00:00:00 2001
From: gloas <gloas@git-test.afi-sa.fr>
Date: Mon, 30 Sep 2013 15:08:00 +0000
Subject: [PATCH] reponseFormulaire : mail save + tests

---
 cosmogramme/sql/patch/patch_174.sql | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cosmogramme/sql/patch/patch_174.sql b/cosmogramme/sql/patch/patch_174.sql
index c5c80bb498f..0ff2afb4f95 100644
--- a/cosmogramme/sql/patch/patch_174.sql
+++ b/cosmogramme/sql/patch/patch_174.sql
@@ -1,6 +1,4 @@
-<<<<<<< HEAD
 delete from bib_admin_var where clef='CSS_EDITOR'; 
-=======
 alter table formulaires add column id_user_moderateur int(11);
 alter table formulaires add column mail_answer text;
->>>>>>> reponseFormulaire : mail save + tests
+
-- 
GitLab