Fix travis error

2016-02-22 16:20:21 +01:00 · 2016-02-22 16:20:21 +01:00 · f759f26db9
commit f759f26db9
parent ef497e2129
1 changed files with 0 additions and 1 deletions
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@ -250,7 +250,6 @@ ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ht double(24,8) DEFAULT
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_tva double(24,8) DEFAULT 0;
 ALTER TABLE llx_propaldet ADD COLUMN multicurrency_total_ttc double(24,8) DEFAULT 0;

-<<<<<<< HEAD
 
 -- Add for recurring template invoices