-
GILLES Sebastien authored
# Conflicts: # HappyHeart.xcodeproj/project.pbxproj # Sources/ModelInstances/FSI_EI/Newton/ModelForward.hxx # Sources/ThirdParty/Wrappers/Petsc/Solver/Snes.cpp # Sources/ThirdParty/Wrappers/Petsc/Solver/Snes.hpp
c1b49bb1
# Conflicts: # HappyHeart.xcodeproj/project.pbxproj # Sources/ModelInstances/FSI_EI/Newton/ModelForward.hxx # Sources/ThirdParty/Wrappers/Petsc/Solver/Snes.cpp # Sources/ThirdParty/Wrappers/Petsc/Solver/Snes.hpp