# Conflicts:
#	.gitlab-ci.yml
#	CMakeLists.txt
#	FindBoost.cmake
#	build.sh
#	build_scripts/windows/win_VS_build_x64_debug.bat
#	include/4neuro.h
#	src/CMakeLists.txt
#	src/DataSet/DataSet.h
#	src/General/ExprtkWrapper.h
#	src/LearningMethods/ParticleSwarm.h
#	src/NetConnection/ConnectionFunctionGeneral.h
#	src/NetConnection/ConnectionFunctionIdentity.h
#	src/Network/NeuralNetwork.h
#	src/Network/NeuralNetworkSum.h
#	src/Neuron/Neuron.h
#	src/Neuron/NeuronBinary.h
#	src/Neuron/NeuronConstant.h
#	src/Neuron/NeuronLinear.h
#	src/Neuron/NeuronLogistic.h
#	src/examples/CMakeLists.txt
#	src/message.h
#	src/tests/CMakeLists.txt