LLNL / libROM

Model reduction library with an emphasis on large scale parallelism and linear subspace methods
https://www.librom.net
Other
201 stars 36 forks source link

fixed unresolved conflict #142

Closed chldkdtn closed 1 year ago

chldkdtn commented 1 year ago

Fixed previously unresolved conflict

chldkdtn commented 1 year ago

@dylan-copeland @pranav-vempati @siuwuncheung Can you fast review and approve this PR soon? This fixes unresolved conflict.