Dolibarr/dolibarr — pull request #437 by atm-maxime (2012-10-05 06:36:20+00:00)
Title: Branch mko186 merged

Hi. I merged my mko186 branch with develop which is up to date. Is that how I have to proceed to resolve conflicts ?