> Text conflict in EventDetails.qml > 1 conflicts encountered. > bzr: ERROR: Conflicts from merge > > > Jenkins is set to merge this once it's fixed.
Thanks nick, I will do the needful
« Back to merge proposal
> Text conflict in EventDetails.qml
> 1 conflicts encountered.
> bzr: ERROR: Conflicts from merge
>
>
> Jenkins is set to merge this once it's fixed.
Thanks nick, I will do the needful