[
https://issues.apache.org/jira/browse/OFBIZ-11468?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17106188#comment-17106188 ]
Jacques Le Roux commented on OFBIZ-11468:
-----------------------------------------
Hi Wiebke,
Sorry It's still an issue for me, could you please check?
{noformat}
This branch has conflicts that must be resolved
Ude the command line to resolve conflicts before continuing.
Conflicting files
applications/product/minilang/shipment/receipt/ShipmentReceiptServices.xml
applications/product/servicedef/services_shipment.xml
{noformat}
> Convert ShipmentReceiptServices.xml mini lang to groovy
> -------------------------------------------------------
>
> Key: OFBIZ-11468
> URL:
https://issues.apache.org/jira/browse/OFBIZ-11468> Project: OFBiz
> Issue Type: Sub-task
> Reporter: Wiebke Pätzold
> Assignee: Wiebke Pätzold
> Priority: Minor
> Time Spent: 10m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)