# Conflicts:
#	src/CMakeLists.txt
#	src/DCPSE/DCPSE_op/EqnsStruct.hpp
#	src/DCPSE/DcpseDiagonalScalingMatrix.hpp
#	src/Operators/Vector/cuda/vector_dist_operators_cuda.cuh
#	src/Operators/Vector/vector_dist_operators.hpp