[Dolibarr/dolibarr] a8656f: Travis fix

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a8656fe6125e6d03d2dbe6444aab0a22b73611f9
      
https://github.com/Dolibarr/dolibarr/commit/a8656fe6125e6d03d2dbe6444aab0a22b73611f9
  Author: andreubisquerra <address@hidden>
  Date:   2020-01-27 (Mon, 27 Jan 2020)

  Changed paths:
    M htdocs/takepos/takepos.php

  Log Message:
  -----------
  Travis fix


  Commit: 37f5922bf84a4c09cfc9815d2fd50782e8658da4
      
https://github.com/Dolibarr/dolibarr/commit/37f5922bf84a4c09cfc9815d2fd50782e8658da4
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-27 (Mon, 27 Jan 2020)

  Changed paths:
    M htdocs/takepos/css/pos.css

  Log Message:
  -----------
  Fix conflict


Compare: 
https://github.com/Dolibarr/dolibarr/compare/539348bbbb27...37f5922bf84a