> Needs to be merged with trunk. There is currently an unresolved merge > conflict.
Looks resolved to me, am I missing something?
« Back to merge proposal
> Needs to be merged with trunk. There is currently an unresolved merge
> conflict.
Looks resolved to me, am I missing something?