FIX merge conflict
This commit is contained in:
parent
46f9911ea7
commit
a3466b3fa4
1 changed files with 0 additions and 6 deletions
|
|
@ -47,7 +47,6 @@ insert into llx_const (name, value, type, note, visible, entity) values ('SYSLOG
|
|||
-- Hidden but specific to one entity
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_UPLOAD_DOC','2048','chaine','Max size for file upload (0 means no upload allowed)',0,__ENTITY__);
|
||||
|
||||
<<<<<<< HEAD
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_OVERWRITE_TRANSLATION','1','chaine','Enable translation overwrite',0,__ENTITY__);
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_DEFAULT_VALUES','1','chaine','Enable default value overwrite',0,__ENTITY__);
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Currency',0,__ENTITY__);
|
||||
|
|
@ -55,11 +54,6 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M
|
|||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0,__ENTITY__);
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',0,__ENTITY__);
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','email emitter for Dolibarr automatic emails',0,__ENTITY__);
|
||||
=======
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0,1);
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',0,1);
|
||||
insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.tld','chaine','email emitter for Dolibarr automatic emails',0,1);
|
||||
>>>>>>> branch 'develop' of git@github.com:Dolibarr/dolibarr.git
|
||||
|
||||
--
|
||||
-- IHM
|
||||
|
|
|
|||
Loading…
Reference in a new issue