-
Spencer Sherwin authored
Conflicts: library/MultiRegions/ExpList.cpp library/SpatialDomains/GeomFactors2D.cpp library/StdRegions/StdExpansion.cpp
24bea5c8
Conflicts: library/MultiRegions/ExpList.cpp library/SpatialDomains/GeomFactors2D.cpp library/StdRegions/StdExpansion.cpp