message: resolving conflicts with master
diff: @@ -267,7 +267,7 @@ public:
  Complex_Operator, ///< ID for class ComplexOperator.
  MFEM_ComplexSparseMat, ///< ID for class ComplexSparseMatrix.
  Complex_Hypre_ParCSR, ///< ID for class ComplexHypreParMatrix.
  - Complex_DenseMat ///< ID for class ComplexDenseMatrix
  + Complex_DenseMat, ///< ID for class ComplexDenseMatrix
  MFEM_Block_Matrix, ///< ID for class BlockMatrix.
  MFEM_Block_Operator ///< ID for the base class BlockOperator.
  };
  