[Dolibarr-git] [Dolibarr/dolibarr] 1bc803: Fix minor merge issue

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1bc8035f9473cf056044e84bd395c9f2847760b7
      
https://github.com/Dolibarr/dolibarr/commit/1bc8035f9473cf056044e84bd395c9f2847760b7
  Author: Rui Strecht <address@hidden>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M htdocs/contact/list.php

  Log Message:
  -----------
  Fix minor merge issue


  Commit: e9728ed73b7c770e72eab2144214131179ce855a
      
https://github.com/Dolibarr/dolibarr/commit/e9728ed73b7c770e72eab2144214131179ce855a
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M htdocs/contact/list.php

  Log Message:
  -----------
  Merge pull request #8639 from ruistrecht-alt/FIX_Minor_merge_issue

Fix minor merge issue


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2f19ba11e5a3...e9728ed73b7c