Too many conflicts in FLUID-4907

Justin Obara obara.justin at
Wed Aug 14 13:02:23 UTC 2013

Hi Antranig,

Thanks for looking at this. I ran into this issue just as I was leaving yesterday, and had it at the top of my list of things to do this morning. i've pulled in your changes and merged everything with master. After working through the conflicts, it looks like everything is operating as expected again.

you can see this in my branch:


On 2013-08-14, at 12:38 AM, Antranig Basman <Antranig.Basman at> wrote:

> Unfortunately it seems that UIOptions work in master has caused the branch to diverge too far for it to be easily merged in - I made a few light changes entered as but then discovered that the merge was bad. Could somebody remerge the branch with master? Cheers,
> A
> _______________________________________________________
> fluid-work mailing list - fluid-work at
> To unsubscribe, change settings or access archives,
> see

More information about the fluid-work mailing list