• David E. DeMarle's avatar
    fix failing tests by switching a merge conflict resolution · 45aad5aa
    David E. DeMarle authored
    these tests fail with it the other way.
    C_CTestXdmfWriter (Failed)
    C_CTestXdmfAggregate (Failed)
    Cxx_TestXdmfAggregate (Failed)
    Cxx_TestXdmfFunction (Failed) new fail
    Cxx_TestXdmfSubset
    
    xml file for aggregate is no different, but reading
    balks at lack of "Content" the other way around
    45aad5aa
Name
Last commit
Last update
..
dsm Loading commit data...
loki Loading commit data...
tests Loading commit data...
CMakeLists.txt Loading commit data...
XdmfArray.cpp Loading commit data...
XdmfArray.hpp Loading commit data...
XdmfArray.tpp Loading commit data...
XdmfArrayReference.cpp Loading commit data...
XdmfArrayReference.hpp Loading commit data...
XdmfArrayType.cpp Loading commit data...
XdmfArrayType.hpp Loading commit data...
XdmfBinaryController.cpp Loading commit data...
XdmfBinaryController.hpp Loading commit data...
XdmfConfig.hpp.in Loading commit data...
XdmfCore.hpp Loading commit data...
XdmfCore.i Loading commit data...
XdmfCoreConfig.hpp.in Loading commit data...
XdmfCoreItemFactory.cpp Loading commit data...
XdmfCoreItemFactory.hpp Loading commit data...
XdmfCoreReader.cpp Loading commit data...
XdmfCoreReader.hpp Loading commit data...
XdmfError.cpp Loading commit data...
XdmfError.hpp Loading commit data...
XdmfFunction.cpp Loading commit data...
XdmfFunction.hpp Loading commit data...
XdmfHDF5Controller.cpp Loading commit data...
XdmfHDF5Controller.hpp Loading commit data...
XdmfHDF5Writer.cpp Loading commit data...
XdmfHDF5Writer.hpp Loading commit data...
XdmfHeavyDataController.cpp Loading commit data...
XdmfHeavyDataController.hpp Loading commit data...
XdmfHeavyDataDescription.cpp Loading commit data...
XdmfHeavyDataDescription.hpp Loading commit data...
XdmfHeavyDataWriter.cpp Loading commit data...
XdmfHeavyDataWriter.hpp Loading commit data...
XdmfInformation.cpp Loading commit data...
XdmfInformation.hpp Loading commit data...
XdmfItem.cpp Loading commit data...
XdmfItem.hpp Loading commit data...
XdmfItemProperty.cpp Loading commit data...
XdmfItemProperty.hpp Loading commit data...
XdmfPlaceholder.cpp Loading commit data...
XdmfPlaceholder.hpp Loading commit data...
XdmfSharedPtr.hpp Loading commit data...
XdmfSparseMatrix.cpp Loading commit data...
XdmfSparseMatrix.hpp Loading commit data...
XdmfSubset.cpp Loading commit data...
XdmfSubset.hpp Loading commit data...
XdmfSystemUtils.cpp Loading commit data...
XdmfSystemUtils.hpp Loading commit data...
XdmfTIFFController.cpp Loading commit data...
XdmfTIFFController.hpp Loading commit data...
XdmfVisitor.cpp Loading commit data...
XdmfVisitor.hpp Loading commit data...
XdmfWriter.cpp Loading commit data...
XdmfWriter.hpp Loading commit data...