message: Fix bad resolution of merge conflict
diff: @@ -39,7 +39,16 @@ void MassIntegrator::AssemblePA(const FiniteElementSpace &fes)
  if (DeviceCanUseCeed())
  {
  delete ceedOp;
  + const bool mixed = mesh->GetNumGeometries(mesh->Dimension()) > 1 ||
  + fes.IsVariableOrder();
  + if (mixed)
  + {
  + ceedOp = new ceed::MixedPAMassIntegrator(*this, fes, Q);
  + }
  + else
  + {
  ceedOp = new ceed::PAMassIntegrator(fes, *ir, Q);
  + }
  return;
  }
  int map_type = el.GetMapType();
  