fixed merge

cardmech/src/CardiacAssemble.hpp

@@ -9,6 +9,7 @@
 #include "discretization/IDiscretization.hpp"
 #include "CardiacData.hpp"
 #include "ScalarElement.hpp"
+#include "LagrangeDiscretization.hpp"
 
 
 const Point shift2(-exp(1.3), 0.0);

cardmech/src/elasticity/materials/Material.hpp

@@ -4,6 +4,8 @@
 #include "utility/Config.hpp"
 #include "VolumetricPenalty.hpp"
 #include <Tensor.hpp>
+#include <functional>
+
 
 
 static Tensor DeformationGradient(const Tensor &Du) { return One + Du; }

mpp @ bcafb16a

-Subproject commit a56c00e6057aeed8404df87c27ea2c6c7e5e5850
+Subproject commit bcafb16abda9c2fe4deeb7156b652b9cae1dfe80