Problem of merging

htdocs/install/mysql/migration/3.6.0-3.7.0.sql

@@ -972,7 +972,6 @@ CREATE TABLE llx_holiday_types (
   deleteAt DATETIME,
   nbCongesDeducted varchar(255) NOT NULL,
   nbCongesEveryMonth varchar(255) NOT NULL
-<<<<<<< HEAD
 );
 
 -- Change on table c_civilite
@@ -983,17 +982,13 @@ ALTER TABLE llx_c_civility ADD UNIQUE INDEX uk_c_civility(code);
 ALTER TABLE llx_adherent CHANGE civilite civility VARCHAR(6);
 ALTER TABLE llx_socpeople CHANGE civilite civility VARCHAR(6);
 ALTER TABLE llx_user CHANGE civilite civility VARCHAR(6);
-=======
 ) ENGINE=innodb;
 
 ALTER TABLE llx_c_type_fees CHANGE libelle label VARCHAR(30);
 ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label;
 
-
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_element (fk_element);
 
 ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task);
 ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date);
 ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour);
-
->>>>>>> refs/remotes/Upstream/develop