> Dorin, can you merge the trunk into your branch and resolve conflicts, please? > There are some conflicted changes that look trivial, but I'm not quite sure > about them. That will help me to do final review.
I did it.
« Back to merge proposal
> Dorin, can you merge the trunk into your branch and resolve conflicts, please?
> There are some conflicted changes that look trivial, but I'm not quite sure
> about them. That will help me to do final review.
I did it.