resolve conflict

.gitignore

apps/maarch_entreprise/Models/ContactsModelAbstract.php

apps/maarch_entreprise/class/class_types_Abstract.php

apps/maarch_entreprise/css/styles.css

apps/maarch_entreprise/js/accounting.min.js

...maarch_entreprise/js/angular/app/Views/signatureBook.html

...rch_entreprise/js/angular/app/signature-book.component.js

...rch_entreprise/js/angular/app/signature-book.component.ts

apps/maarch_entreprise/js/angular/main.bundle.min.js

apps/maarch_entreprise/js/functions.js

apps/maarch_entreprise/js/indexing.js

...eprise/js/tooltipster/dist/css/tooltipster.bundle.min.css

...treprise/js/tooltipster/dist/js/tooltipster.bundle.min.js

apps/maarch_entreprise/lang/en.php

apps/maarch_entreprise/lang/fr.php

apps/maarch_entreprise/merged_css.php

apps/maarch_entreprise/merged_jsAbstract.php

apps/maarch_entreprise/xml/IVS/data_types.xml

apps/maarch_entreprise/xml/IVS/validation_rules.xml

apps/maarch_entreprise/xml/database_version.xml