← Back to team overview

dolfin team mailing list archive

Re: Merge problem

 

> It seems that that line was added by Joachim in revision 6540:
>
> http://bazaar.launchpad.net/~jobh/dolfin/symmetric-assemble/annotate/head:/dolfin/la/GenericMatrix.cpp

Aha, yes, it looks like it's a diagnostic that I'd forgotten about. In
fact, that revision wasn't supposed to touch GenericMatrix.* at all.
I'll revert those changes in my branch, just give me a few minutes.

Sorry about that! The dangers of juggling many branches at once...

-j.


References