[Dolibarr-git] [Dolibarr/dolibarr] 8860ea: FIX wrong merged conflict

[Laurent Destailleur]

  Branch: refs/heads/9.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8860eab6b11e449ae1394ae2315690876668aad1
      
https://github.com/Dolibarr/dolibarr/commit/8860eab6b11e449ae1394ae2315690876668aad1
  Author: Regis Houssin <address@hidden>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M htdocs/compta/facture/card.php
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  FIX wrong merged conflict


  Commit: 471f11dacef10c602bcc89e1732a913f978a975e
      
https://github.com/Dolibarr/dolibarr/commit/471f11dacef10c602bcc89e1732a913f978a975e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M htdocs/compta/facture/card.php
    M htdocs/core/lib/functions.lib.php

  Log Message:
  -----------
  Merge pull request #10502 from hregis/9.0_merge

FIX wrong merged conflict


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8d8213503337...471f11dacef1