[Dolibarr-git] [Dolibarr/dolibarr] a60fd6: Fix: Bad merge

[Laurent Destailleur]

  Branch: refs/heads/3.2_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a60fd6265ad902c726dfb6f0e0e6f4d15fbb1f37
      
https://github.com/Dolibarr/dolibarr/commit/a60fd6265ad902c726dfb6f0e0e6f4d15fbb1f37
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M scripts/invoices/email_unpaid_invoices_to_customers.php

  Log Message:
  -----------
  Fix: Bad merge


  Commit: 90ff7c7fdba89e9d9dd04fe95c35e6121cdea71c
      
https://github.com/Dolibarr/dolibarr/commit/90ff7c7fdba89e9d9dd04fe95c35e6121cdea71c
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-15 (Wed, 15 May 2013)

  Changed paths:
    M scripts/invoices/email_unpaid_invoices_to_customers.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php

  Log Message:
  -----------
  Fix: Avoid duplicate emails


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f31aff03746f...90ff7c7fdba8