Hello!

After pulling ffc/next into my outdated local next I encountered several
merge conflicts. It seemed that next has been reset to master.

I was not able to resolve the merge and to get something that did not fail
on the buildbot, so I reset next with master. If there were any branches
merged with next for testing, which have not been merged with master they
need to be re-pushed to next.

Johan
_______________________________________________
fenics mailing list
[email protected]
http://fenicsproject.org/mailman/listinfo/fenics

Reply via email to