> > committed please check > > There are still merge conflicts shown in the diff: around lines 58 and 176.
Hi,
I have looked through, however do not see any conflicts there.. Just a single new line of code was added in both cases.
« Back to merge proposal
> > committed please check
>
> There are still merge conflicts shown in the diff: around lines 58 and 176.
Hi,
I have looked through, however do not see any conflicts there.. Just a single new line of code was added in both cases.