Commit 0b37c6e9 authored by Andrew J. Burns (Cont's avatar Andrew J. Burns (Cont

Fixing improper merge with XdmfFortran header

parent 5006a190
......@@ -542,16 +542,10 @@ public:
const unsigned int numValues,
const int arrayType,
const void * const connectivityValues,
<<<<<<< HEAD
const int numNodes);
=======
const int polyNodesPerElement = 0);
>>>>>>> 6748b23947ebc47742c96d7e3a56242511c67d73
/**
* Returns the number of grid collections currently
* contained in the domain
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment