Too many conflicts in FLUID-4907

Antranig Basman antranig.basman at colorado.edu
Wed Aug 14 04:38:38 UTC 2013


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



More information about the fluid-work mailing list