[Dolibarr-git] [Dolibarr/dolibarr] c7dda5: Fix: doublon (merge problem?)

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c7dda59fbc150eb7c96a7dc7c0e8846af4de5e6f
      
https://github.com/Dolibarr/dolibarr/commit/c7dda59fbc150eb7c96a7dc7c0e8846af4de5e6f
  Author: Regis Houssin <address@hidden>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Fix: doublon (merge problem?)


  Commit: 517b189df2e0d82ce2873d401d72840da334f457
      
https://github.com/Dolibarr/dolibarr/commit/517b189df2e0d82ce2873d401d72840da334f457
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Merge pull request #5225 from hregis/3.8_bug

Fix: doublon (merge problem?)


Compare: 
https://github.com/Dolibarr/dolibarr/compare/43cb646779aa...517b189df2e0