Too many conflicts in FLUID-4907

[Justin Obara]

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:
https://github.com/jobara/infusion/tree/FLUID-4907

Thanks
Justin

On 2013-08-14, at 12:38 AM, Antranig Basman <Antranig.Basman at colorado.edu> 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 https://github.com/fluid-project/infusion/pull/388 but then discovered that the merge was bad. Could somebody remerge the branch with master? Cheers,
> A
> _______________________________________________________
> fluid-work mailing list - fluid-work at fluidproject.org
> To unsubscribe, change settings or access archives,
> see http://lists.idrc.ocad.ca/mailman/listinfo/fluid-work