bug #608 Clean merge conflict trace (vasilvestre)
bug #608 Clean merge conflict trace (vasilvestre)

This PR was merged into the 1.9-dev branch.

Discussion
----------



Commits
-------

4a5f709bf02e0b8b1f222ea166e8e6b6b515e6ef Clean merge conflict trace

Sylius/Sylius-Standard,Sylius/Sylius-Standard,Sylius/Sylius-Standard