firedrakeproject / tsfc

Two-stage form compiler
Other
15 stars 25 forks source link

Fix for conflicting merges #276

Closed connorjward closed 2 years ago

connorjward commented 2 years ago

This line overlapped between https://github.com/firedrakeproject/tsfc/pull/273 and https://github.com/firedrakeproject/tsfc/pull/268 so it got overwritten.