Fixing improper merge with XdmfFortran header

0b37c6e9 · Andrew J. Burns (Cont · 5006a190 · 0b37c6e9
Commit 0b37c6e9 authored Apr 30, 2013 by Andrew J. Burns (Cont
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

utils/XdmfFortran.hpp utils/XdmfFortran.hpp +0 -6

No files found.
--- a/utils/XdmfFortran.hpp
+++ b/utils/XdmfFortran.hpp
@@ -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