danwatford commented on pull request #217:
URL: https://github.com/apache/ofbiz-framework/pull/217#issuecomment-665611006
I'm don't know how to resolve this @JacquesLeRoux .
Before the most recent merge commit a few moments ago I attempted to apply
the patch you linked to against trunk
danwatford commented on pull request #217:
URL: https://github.com/apache/ofbiz-framework/pull/217#issuecomment-665192736
All fixed @JacquesLeRoux
This is an automated message from the Apache Git Service.
To respond to the
danwatford commented on pull request #217:
URL: https://github.com/apache/ofbiz-framework/pull/217#issuecomment-663977565
Hi @JacquesLeRoux , conflict has been fixed now.
This is an automated message from the Apache Git